You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2016/05/05 23:05:29 UTC
[4/4] incubator-geode git commit: GEODE-613 CI Failure:
LocatorLoadSnapshotJUnitTest.testConcurrentBalancing
GEODE-613 CI Failure: LocatorLoadSnapshotJUnitTest.testConcurrentBalancing
I've removed useless threads and timing loop from the test. It will no longer
time out.
GEODE-1346 Typo "Emtpy" affects Exception name and some help strings
This also removes all unreferenced strings from LocalizedStrings and
removes the no-longer-needed ParentLocalizedStrings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3d73bf5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3d73bf5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3d73bf5c
Branch: refs/heads/develop
Commit: 3d73bf5ca7e9e1d682710706d2dd3a51c2c59c4d
Parents: f74d04b
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Thu May 5 15:15:58 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Thu May 5 16:04:47 2016 -0700
----------------------------------------------------------------------
.../execute/EmptyRegionFunctionException.java | 6 +-
.../membership/InternalDistributedMember.java | 40 +
.../internal/membership/gms/GMSMember.java | 16 +
.../internal/cache/PartitionedRegion.java | 6 +-
.../gemfire/internal/i18n/LocalizedStrings.java | 2456 +++++++++++++++---
.../internal/i18n/ParentLocalizedStrings.java | 2399 -----------------
.../gemfire/distributed/LocatorDUnitTest.java | 34 +
.../internal/i18n/BasicI18nJUnitTest.java | 4 +-
.../codeAnalysis/sanctionedSerializables.txt | 2 +-
9 files changed, 2143 insertions(+), 2820 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3d73bf5c/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java
old mode 100644
new mode 100755
index a077779..c5a4a7a
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java
@@ -29,7 +29,7 @@ public class EmptyRegionFunctionException extends FunctionException {
private static final long serialVersionUID = 1L;
/**
- * Construct an instance of EmtpyRegionFunctionException
+ * Construct an instance of EmptyRegionFunctionException
*
* @param cause
* a Throwable cause of this exception
@@ -39,7 +39,7 @@ public class EmptyRegionFunctionException extends FunctionException {
}
/**
- * Construct an instance of EmtpyRegionFunctionException
+ * Construct an instance of EmptyRegionFunctionException
*
* @param msg
* Exception message
@@ -49,7 +49,7 @@ public class EmptyRegionFunctionException extends FunctionException {
}
/**
- * Construct an instance of EmtpyRegionFunctionException
+ * Construct an instance of EmptyRegionFunctionException
*
* @param msg
* the error message
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3d73bf5c/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
index f7572af..2ccbd89 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
@@ -863,9 +863,19 @@ public class InternalDistributedMember
DataSerializer.writeString(this.hostName, out);
int flags = 0;
+<<<<<<< Updated upstream
if (netMbr.isNetworkPartitionDetectionEnabled()) flags |= NPD_ENABLED_BIT;
if (netMbr.preferredForCoordinator()) flags |= COORD_ENABLED_BIT;
if (this.isPartial) flags |= PARTIAL_ID_BIT;
+||||||| merged common ancestors
+ if (netMbr.splitBrainEnabled()) flags |= SB_ENABLED_MASK;
+ if (netMbr.preferredForCoordinator()) flags |= COORD_ENABLED_MASK;
+ if (this.isPartial) flags |= PARTIAL_ID_MASK;
+=======
+ if (netMbr.isNetworkPartitionDetectionEnabled()) flags |= SB_ENABLED_MASK;
+ if (netMbr.preferredForCoordinator()) flags |= COORD_ENABLED_MASK;
+ if (this.isPartial) flags |= PARTIAL_ID_MASK;
+>>>>>>> Stashed changes
// always write product version but enable reading from older versions
// that do not have it
flags |= VERSION_BIT;
@@ -955,9 +965,19 @@ public class InternalDistributedMember
DataSerializer.writeString(this.hostName, out);
int flags = 0;
+<<<<<<< Updated upstream
if (netMbr.isNetworkPartitionDetectionEnabled()) flags |= NPD_ENABLED_BIT;
if (netMbr.preferredForCoordinator()) flags |= COORD_ENABLED_BIT;
if (this.isPartial) flags |= PARTIAL_ID_BIT;
+||||||| merged common ancestors
+ if (netMbr.splitBrainEnabled()) flags |= SB_ENABLED_MASK;
+ if (netMbr.preferredForCoordinator()) flags |= COORD_ENABLED_MASK;
+ if (this.isPartial) flags |= PARTIAL_ID_MASK;
+=======
+ if (netMbr.isNetworkPartitionDetectionEnabled()) flags |= SB_ENABLED_MASK;
+ if (netMbr.preferredForCoordinator()) flags |= COORD_ENABLED_MASK;
+ if (this.isPartial) flags |= PARTIAL_ID_MASK;
+>>>>>>> Stashed changes
// always write product version but enable reading from older versions
// that do not have it
flags |= VERSION_BIT;
@@ -997,9 +1017,19 @@ public class InternalDistributedMember
DataSerializer.writeString(this.hostName, out);
int flags = 0;
+<<<<<<< Updated upstream
if (netMbr.isNetworkPartitionDetectionEnabled()) flags |= NPD_ENABLED_BIT;
if (netMbr.preferredForCoordinator()) flags |= COORD_ENABLED_BIT;
if (this.isPartial) flags |= PARTIAL_ID_BIT;
+||||||| merged common ancestors
+ if (netMbr.splitBrainEnabled()) flags |= SB_ENABLED_MASK;
+ if (netMbr.preferredForCoordinator()) flags |= COORD_ENABLED_MASK;
+ if (this.isPartial) flags |= PARTIAL_ID_MASK;
+=======
+ if (netMbr.isNetworkPartitionDetectionEnabled()) flags |= SB_ENABLED_MASK;
+ if (netMbr.preferredForCoordinator()) flags |= COORD_ENABLED_MASK;
+ if (this.isPartial) flags |= PARTIAL_ID_MASK;
+>>>>>>> Stashed changes
out.writeByte((byte)(flags & 0xff));
out.writeInt(dcPort);
@@ -1170,9 +1200,19 @@ public class InternalDistributedMember
out.writeInt(getPort());
int flags = 0;
+<<<<<<< Updated upstream
if (netMbr.isNetworkPartitionDetectionEnabled()) flags |= NPD_ENABLED_BIT;
if (netMbr.preferredForCoordinator()) flags |= COORD_ENABLED_BIT;
flags |= PARTIAL_ID_BIT;
+||||||| merged common ancestors
+ if (netMbr.splitBrainEnabled()) flags |= SB_ENABLED_MASK;
+ if (netMbr.preferredForCoordinator()) flags |= COORD_ENABLED_MASK;
+ flags |= PARTIAL_ID_MASK;
+=======
+ if (netMbr.isNetworkPartitionDetectionEnabled()) flags |= SB_ENABLED_MASK;
+ if (netMbr.preferredForCoordinator()) flags |= COORD_ENABLED_MASK;
+ flags |= PARTIAL_ID_MASK;
+>>>>>>> Stashed changes
out.writeByte((byte)(flags & 0xff));
// out.writeInt(dcPort);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3d73bf5c/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMember.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMember.java
index 6089eb8..8af5e0d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMember.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMember.java
@@ -399,8 +399,16 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
Version.writeOrdinal(out, this.versionOrdinal, true);
int flags = 0;
+<<<<<<< Updated upstream
if (networkPartitionDetectionEnabled) flags |= NPD_ENABLED_BIT;
if (preferredForCoordinator) flags |= PREFERRED_FOR_COORD_BIT;
+||||||| merged common ancestors
+ if (splitBrainEnabled) flags |= SB_ENABLED;
+ if (preferredForCoordinator) flags |= PREFERRED_FOR_COORD;
+=======
+ if (networkPartitionDetectionEnabled) flags |= SB_ENABLED;
+ if (preferredForCoordinator) flags |= PREFERRED_FOR_COORD;
+>>>>>>> Stashed changes
out.writeShort(flags);
DataSerializer.writeInetAddress(inetAddr, out);
@@ -421,8 +429,16 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
this.versionOrdinal = Version.readOrdinal(in);
int flags = in.readShort();
+<<<<<<< Updated upstream
this.networkPartitionDetectionEnabled = (flags & NPD_ENABLED_BIT) != 0;
this.preferredForCoordinator = (flags & PREFERRED_FOR_COORD_BIT) != 0;
+||||||| merged common ancestors
+ this.splitBrainEnabled = (flags & SB_ENABLED) != 0;
+ this.preferredForCoordinator = (flags & PREFERRED_FOR_COORD) != 0;
+=======
+ this.networkPartitionDetectionEnabled = (flags & SB_ENABLED) != 0;
+ this.preferredForCoordinator = (flags & PREFERRED_FOR_COORD) != 0;
+>>>>>>> Stashed changes
this.inetAddr = DataSerializer.readInetAddress(in);
this.udpPort = in.readInt();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3d73bf5c/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
index 328c196..4460a8a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
@@ -92,7 +92,7 @@ import com.gemstone.gemfire.cache.TransactionDataNotColocatedException;
import com.gemstone.gemfire.cache.TransactionDataRebalancedException;
import com.gemstone.gemfire.cache.TransactionException;
import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl;
-import com.gemstone.gemfire.cache.execute.EmtpyRegionFunctionException;
+import com.gemstone.gemfire.cache.execute.EmptyRegionFunctionException;
import com.gemstone.gemfire.cache.execute.Function;
import com.gemstone.gemfire.cache.execute.FunctionContext;
import com.gemstone.gemfire.cache.execute.FunctionException;
@@ -3879,7 +3879,7 @@ public class PartitionedRegion extends LocalRegion implements
logger.debug("Executing on bucketset : {} executeOnBucketSet Member to buckets map is : {} bucketSet is empty",
bucketSet, memberToBuckets);
}
- throw new EmtpyRegionFunctionException(
+ throw new EmptyRegionFunctionException(
LocalizedStrings.PartitionedRegion_FUNCTION_NOT_EXECUTED_AS_REGION_IS_EMPTY
.toLocalizedString());
}
@@ -4023,7 +4023,7 @@ public class PartitionedRegion extends LocalRegion implements
.groupByMemberToBuckets(this, bucketSet, function.optimizeForWrite());
if (memberToBuckets.isEmpty()) {
- throw new EmtpyRegionFunctionException(LocalizedStrings.PartitionedRegion_FUNCTION_NOT_EXECUTED_AS_REGION_IS_EMPTY.toLocalizedString()
+ throw new EmptyRegionFunctionException(LocalizedStrings.PartitionedRegion_FUNCTION_NOT_EXECUTED_AS_REGION_IS_EMPTY.toLocalizedString()
);
}