do not validate servers against standby nodes

Author: Myron Scott

tc-server/src/main/java/com/tc/objectserver/entity/ActiveToPassiveReplication.java

@@ -138,17 +138,19 @@ private SessionID prime(ServerID node) {
     Assert.assertFalse(node.isNull());
     SessionID current = passiveNodes.get(node);
     //  no session means we are allowed to proceed
-    if (current == null && serverIsValid(node)) {
+    if (current == null) {
       if (!consistencyMgr.requestTransition(ServerMode.ACTIVE, node, ConsistencyManager.Transition.ADD_PASSIVE)) {
         serverCheck.zapNode(node, L2HAZapNodeRequestProcessor.SPLIT_BRAIN, "unable to verify active");
         return SessionID.NULL_ID;
       } else {
-        LOGGER.debug("Starting message sequence on " + node);
+        LOGGER.info("Starting message sequence on " + node);
         SessionID newSession = new SessionID(sessionMaker.incrementAndGet());
         if (passiveNodes.putIfAbsent(node, newSession) == null) {
-          boolean sent = this.replicationSender.addPassive(node, newSession, executionLane(newSession), SyncReplicationActivity.createStartMessage());
-          Assert.assertTrue(sent);
-          return newSession;
+          if (this.replicationSender.addPassive(node, newSession, executionLane(newSession), SyncReplicationActivity.createStartMessage())) {
+            return newSession;
+          } else {
+            passiveNodes.remove(node, newSession);
+          }
         }
       }
     }
@@ -177,12 +179,8 @@ public boolean startPassiveSync(ServerID newNode) {
       executePassiveSync(newNode, session);
       return true;
     } else {
-      if (!passiveNodes.containsKey(newNode)) {
-        LOGGER.info("passive node {} to requesting prime is no longer a valid passive", newNode);
-      } else {
-        LOGGER.info("unable to prime connection to {} for passive sync", newNode);
-        serverCheck.closeMember(newNode);
-      }
+      LOGGER.info("unable to prime connection to {} for passive sync", newNode);
+      serverCheck.closeMember(newNode);
       return false;
     }
   }