geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dschnei...@apache.org
Subject geode git commit: remove meaningless tx warning message
Date Tue, 02 May 2017 22:10:39 GMT
Repository: geode
Updated Branches:
  refs/heads/feature/GEODE-2864 [created] b27df469b


remove meaningless tx warning message


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b27df469
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b27df469
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b27df469

Branch: refs/heads/feature/GEODE-2864
Commit: b27df469bfc09cf6ceec95ae2ce1f48472eabbd6
Parents: dc6b600
Author: Darrel Schneider <dschneider@pivotal.io>
Authored: Tue May 2 15:09:59 2017 -0700
Committer: Darrel Schneider <dschneider@pivotal.io>
Committed: Tue May 2 15:09:59 2017 -0700

----------------------------------------------------------------------
 .../DistTXStateProxyImplOnCoordinator.java      | 42 --------------------
 .../geode/internal/cache/TXCommitMessage.java   | 20 ----------
 .../geode/internal/i18n/LocalizedStrings.java   |  3 +-
 3 files changed, 1 insertion(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/b27df469/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java
index 68bde4e..172fabe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java
@@ -440,50 +440,8 @@ public class DistTXStateProxyImplOnCoordinator extends DistTXStateProxyImpl
{
     boolean finalResult = true;
     final GemFireCacheImpl cache = GemFireCacheImpl.getExisting("Applying Dist TX Precommit");
     final DM dm = cache.getDistributionManager();
-
-    // Create Tx Participants
-    Set<DistributedMember> txParticpants = target2realDeals.keySet();
     Set<DistributedMember> txRemoteParticpants = getTxRemoteParticpants(dm);
 
-    // Determine if the set of VMs for any of the Regions for this TX have
-    // changed
-    HashSet<LocalRegion> affectedRegions = new HashSet<LocalRegion>();
-    for (DistTXCoordinatorInterface distTXStateStub : target2realDeals.values()) {
-      affectedRegions.clear();
-      distTXStateStub.gatherAffectedRegions(affectedRegions, true, false);
-      for (LocalRegion lr : affectedRegions) {
-        if (lr.getScope().isLocal()) {
-          continue;
-        }
-        if (lr instanceof DistributedRegion) {
-          DistributedRegion dr = (DistributedRegion) lr;
-          CacheDistributionAdvisor adv = dr.getCacheDistributionAdvisor();
-          Set newRegionMemberView = adv.adviseTX();
-
-          if (!txParticpants.containsAll(newRegionMemberView)) {
-            logger.warn(LocalizedMessage.create(
-                LocalizedStrings.TXCommitMessage_NEW_MEMBERS_FOR_REGION_0_ORIG_LIST_1_NEW_LIST_2,
-                new Object[] {dr, txParticpants, newRegionMemberView}));
-          }
-        } else if (lr instanceof PartitionedRegion || lr instanceof BucketRegion) {
-          final PartitionedRegion pr;
-          if (lr instanceof BucketRegion) {
-            pr = ((BucketRegion) lr).getPartitionedRegion();
-          } else {
-            pr = (PartitionedRegion) lr;
-          }
-          CacheDistributionAdvisor adv = pr.getCacheDistributionAdvisor();
-          Set newRegionMemberView = adv.adviseTX();
-
-          if (!txParticpants.containsAll(newRegionMemberView)) {
-            logger.warn(LocalizedMessage.create(
-                LocalizedStrings.TXCommitMessage_NEW_MEMBERS_FOR_REGION_0_ORIG_LIST_1_NEW_LIST_2,
-                new Object[] {pr, txParticpants, newRegionMemberView}));
-          }
-        }
-      }
-    }
-
     // create processor and precommit message
     DistTXPrecommitMessage.DistTxPrecommitReplyProcessor processor =
         new DistTXPrecommitMessage.DistTxPrecommitReplyProcessor(this.getTxId(), dm,

http://git-wip-us.apache.org/repos/asf/geode/blob/b27df469/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
index 7c2a3e3..e6bee71 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
@@ -361,28 +361,8 @@ public class TXCommitMessage extends PooledDistributionMessage
       }
     }
 
-    // Determine if the set of VMs for any of the Regions for this TX have changed
-    HashSet recips = new HashSet(this.msgMap.keySet());
-    DistributedRegion dr = null;
-    Iterator rI = this.txState.getRegions().iterator();
     CommitReplyProcessor processor = null;
     {
-      while (rI.hasNext()) {
-        LocalRegion lr = (LocalRegion) rI.next();
-        if (lr.getScope().isLocal()) {
-          continue;
-        }
-        dr = (DistributedRegion) lr;
-        CacheDistributionAdvisor adv = dr.getCacheDistributionAdvisor();
-        Set newRegionMemberView = adv.adviseTX();
-
-        if (!recips.containsAll(newRegionMemberView)) {
-          logger.warn(LocalizedMessage.create(
-              LocalizedStrings.TXCommitMessage_NEW_MEMBERS_FOR_REGION_0_ORIG_LIST_1_NEW_LIST_2,
-              new Object[] {dr, recips, newRegionMemberView}));
-        }
-      }
-
       if (ackReceivers != null) {
         processor = new CommitReplyProcessor(this.dm, ackReceivers, msgMap);
         if (ackReceivers.size() > 1) {

http://git-wip-us.apache.org/repos/asf/geode/blob/b27df469/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
index 76e4acf..94898cf 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
@@ -1784,8 +1784,7 @@ public class LocalizedStrings {
       new StringId(2102, "Timed out waiting for ACKS.");
   public static final StringId TXCommitMessage_EXCEPTION_OCCURRED_IN_TRANSACTIONLISTENER
=
       new StringId(2103, "Exception occurred in TransactionListener");
-  public static final StringId TXCommitMessage_NEW_MEMBERS_FOR_REGION_0_ORIG_LIST_1_NEW_LIST_2
=
-      new StringId(2104, "New members for Region: {0} orig list: {1} new list: {2}");
+  // 2104 unused
   public static final StringId PartitionedRegion_INDEX_CREATION_FAILED_ROLLING_UPGRADE =
       new StringId(2105,
           "Indexes should not be created when there are older versions of gemfire in the
cluster.");


Mime
View raw message