You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/02/29 21:50:22 UTC
[14/19] incubator-geode git commit: GEODE-870: Handling multiple
concurrent locator restarts. Elder locator nomination
GEODE-870: Handling multiple concurrent locator restarts. Elder locator nomination
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/94035ed3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/94035ed3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/94035ed3
Branch: refs/heads/feature/GEODE-953
Commit: 94035ed311f5f1611b7822ca5a2be192955f45af
Parents: 36eb11b
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Feb 10 09:20:09 2016 +1100
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Mon Feb 29 16:46:39 2016 +1100
----------------------------------------------------------------------
.../gms/messages/ViewRejectMessage.java | 96 --------------------
.../gms/membership/GMSJoinLeaveHelper.java | 60 ++++++++++++
.../internal/membership/NetView.java | 3 +
3 files changed, 63 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/94035ed3/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/ViewRejectMessage.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/ViewRejectMessage.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/ViewRejectMessage.java
deleted file mode 100755
index e5bf9e2..0000000
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/ViewRejectMessage.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.distributed.internal.membership.gms.messages;
-
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.distributed.internal.membership.NetView;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-public class ViewRejectMessage extends HighPriorityDistributionMessage {
-
- private int viewId;
- private NetView rejectedView;
- private String reason;
-
- public ViewRejectMessage(InternalDistributedMember recipient, int viewId, NetView rejectedView, String reason) {
- super();
- setRecipient(recipient);
- this.viewId = viewId;
- this.rejectedView = rejectedView;
- this.reason = reason;
- }
-
- public ViewRejectMessage() {
- // no-arg constructor for serialization
- }
-
- public int getViewId() {
- return viewId;
- }
-
- public NetView getRejectedView() {
- return this.rejectedView;
- }
-
-
- @Override
- public int getDSFID() {
- // TODO Auto-generated method stub
- return VIEW_REJECT_MESSAGE;
- }
-
- public String getReason() {
- return reason;
- }
-
- @Override
- public int getProcessorType() {
- return 0;
- }
-
- @Override
- public void process(DistributionManager dm) {
- throw new IllegalStateException("this message is not intended to execute in a thread pool");
- }
-
- @Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
- out.writeInt(this.viewId);
- DataSerializer.writeObject(this.rejectedView, out);
- }
-
- @Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
- this.viewId = in.readInt();
- this.rejectedView = DataSerializer.readObject(in);
- }
-
- @Override
- public String toString() {
- String s = getSender() == null? getRecipientsDescription() : ""+getSender();
- return "ViewRejectMessage("+s+"; "+this.viewId+"; rejectedView="+this.rejectedView +")";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/94035ed3/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveHelper.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveHelper.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveHelper.java
new file mode 100644
index 0000000..b8311bc
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveHelper.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.distributed.internal.membership.gms.membership;
+
+import com.gemstone.gemfire.distributed.Locator;
+import com.gemstone.gemfire.distributed.internal.DM;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.distributed.internal.membership.gms.Services;
+import com.gemstone.gemfire.distributed.internal.membership.gms.mgr.GMSMembershipManager;
+
+public class GMSJoinLeaveHelper {
+ public static boolean isViewCreator() {
+ GMSJoinLeave gmsJoinLeave = getGmsJoinLeave();
+ if (gmsJoinLeave != null) {
+ GMSJoinLeave.ViewCreator viewCreator = gmsJoinLeave.getViewCreator();
+ if (viewCreator != null && !viewCreator.isShutdown()) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ throw new RuntimeException("This should not have happened. There should be a JoinLeave for every DS");
+ }
+
+ private static GMSJoinLeave getGmsJoinLeave() {
+ InternalDistributedSystem distributedSystem = getInternalDistributedSystem();
+ DM dm = distributedSystem.getDM();
+ GMSMembershipManager membershipManager = (GMSMembershipManager) dm.getMembershipManager();
+ Services services = membershipManager.getServices();
+ return (GMSJoinLeave) services.getJoinLeave();
+ }
+
+ public static Integer getViewId() {
+ return getGmsJoinLeave().getView().getViewId();
+ }
+
+ private static InternalDistributedSystem getInternalDistributedSystem() {
+ InternalDistributedSystem distributedSystem = InternalDistributedSystem.getAnyInstance();
+ if (distributedSystem == null) {
+ Locator locator = Locator.getLocator();
+ return (InternalDistributedSystem) locator.getDistributedSystem();
+ } else {
+ return distributedSystem;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/94035ed3/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java
index af4aec3..af05f82 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java
@@ -48,6 +48,9 @@ import com.gemstone.gemfire.internal.Version;
*/
public class NetView implements DataSerializableFixedID {
+ private static final Logger logger = LogService.getLogger();
+
+
private int viewId;
private List<InternalDistributedMember> members;
private int[] failureDetectionPorts = new int[10];