remove improper assertion for client based on failover ordering

Author: Myron Scott

tc-server/src/main/java/com/tc/objectserver/api/EntityManager.java

@@ -22,6 +22,7 @@
 import com.tc.entity.MessageCodecSupplier;
 import com.tc.entity.VoltronEntityMessage;
 import com.tc.exception.ServerException;
+import com.tc.net.ClientID;
 import com.tc.object.EntityDescriptor;
 import com.tc.object.EntityID;
 import com.tc.object.FetchID;
@@ -30,6 +31,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Predicate;
 
 public interface EntityManager extends MessageCodecSupplier, PrettyPrintable {
@@ -78,7 +80,7 @@ public interface EntityManager extends MessageCodecSupplier, PrettyPrintable {
    */
   void loadExisting(EntityID entityID, long recordedVersion, long consumerID, boolean canDelete, byte[] configuration) throws ServerException;
 
-  void resetReferences();
+  Set<ClientID> resetReferences();
 
   boolean canDelete(EntityID entityID);
 

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

@@ -23,6 +23,7 @@
 import com.tc.entity.VoltronEntityMessage;
 import com.tc.exception.ServerException;
 import com.tc.exception.TCShutdownServerException;
+import com.tc.net.ClientID;
 import com.tc.object.ClientInstanceID;
 import com.tc.object.EntityDescriptor;
 
@@ -343,11 +344,11 @@ private EntityServerService<EntityMessage, EntityResponse> getVersionCheckedServ
   }
 
   @Override
-  public void resetReferences() {
-    clientEntityStateManager.clearClientReferences();
+  public Set<ClientID> resetReferences() {
     for (ManagedEntity me : entityIndex.values()) {
       me.resetReferences(0);
     }
+    return clientEntityStateManager.clearClientReferences();
   }
 
   @Override

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

@@ -1108,8 +1108,6 @@ public Runnable promoteEntity() throws ConfigurationException {
 // up on passives
     if (canDelete) {
       this.clientReferenceCount = 0;
-      // the entity references should have been cleared
-      Assert.assertTrue(clientEntityStateManager.verifyNoEntityReferences(fetchID));
     } else {
       Assert.assertEquals(this.clientReferenceCount, ManagedEntityImpl.UNDELETABLE_ENTITY);
     }

tc-server/src/main/java/com/tc/objectserver/impl/DistributedObjectServer.java

@@ -738,7 +738,7 @@ public synchronized void bootstrap() throws IOException, LocationNotCreatedExcep
                                                                   this.stripeIDStateManager,
                                                                   consistencyMgr);
 
-    connectServerStateToReplicatedState(monitoringShimService, state, clientEntityStateManager, l2Coordinator.getReplicatedClusterStateManager());
+    connectServerStateToReplicatedState(monitoringShimService, state, l2Coordinator.getReplicatedClusterStateManager());
 // setup replication
     final Sink<ReplicationSendingAction> replicationSenderStage =
         stageManager.createStage(ServerConfigurationContext.ACTIVE_TO_PASSIVE_DRIVER_STAGE,
@@ -1105,7 +1105,7 @@ public void nodeLeft(NodeID nodeID) {
     };
   }
 
-  private void connectServerStateToReplicatedState(LocalMonitoringProducer monitoringShimService, StateManager mgr, ClientEntityStateManager clients, ReplicatedClusterStateManager rcs) {
+  private void connectServerStateToReplicatedState(LocalMonitoringProducer monitoringShimService, StateManager mgr, ReplicatedClusterStateManager rcs) {
     mgr.registerForStateChangeEvents(new StateChangeListener() {
       private boolean diagnosticsStarted = false;
 
@@ -1122,7 +1122,8 @@ public void l2StateChanged(StateChangedEvent sce) {
           final Set<ClientID> existingClients = new HashSet<>(persistor.getClientStatePersistor().loadAllClientIDs());
 //  must do this because the replicated state when it comes to clients, may not include all the references
 //  to clients that were in the midst of cleaning up after disconnection.
-          existingClients.addAll(clients.clearClientReferences());
+          existingClients.addAll(entityManager.resetReferences());
+          ;
           Set<ConnectionID> existingConnections = existingClients.stream()
               .map(cid->new ConnectionID(ConnectionID.NULL_JVM_ID, cid.toLong(), stripeIDStateManager.getStripeID().getName())).collect(Collectors.toSet());
           getContext().getClientHandshakeManager().setStarting(existingClients);