[WFCORE-989] Don't register the server's proxy controller with the HC…

… until it is functional
wildfly · Sep 20, 2015 · b3fb562 · b3fb562
1 parent a98541b
commit b3fb562
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/host-controller/src/main/java/org/jboss/as/host/controller/ServerInventoryImpl.java b/host-controller/src/main/java/org/jboss/as/host/controller/ServerInventoryImpl.java
@@ -276,8 +276,6 @@ public void reconnectServer(final String serverName, final ModelNode domainModel
         if(running) {
             if(!stopping) {
                  server.reconnectServerProcess(createBootFactory(serverName, domainModel));
-                 // Register the server proxy at the domain controller
-                 domainController.registerRunningServer(server.getProxyController());
             } else {
                  server.setServerProcessStopping();
             }
@@ -477,6 +475,8 @@ public boolean serverReconnected(String serverProcessName, ManagementChannelHand
         serverCommunicationRegistered(serverProcessName, channelHandler);
         // Mark the server as started
         serverStarted(serverProcessName);
+        // Register the server proxy at the domain controller
+        domainController.registerRunningServer(server.getProxyController());
         // If the server requires a reload, means we are out of sync
         return server.isRequiresReload() == false;
     }

diff --git a/...ntroller/src/main/java/org/jboss/as/host/controller/mgmt/ServerToHostProtocolHandler.java b/...ntroller/src/main/java/org/jboss/as/host/controller/mgmt/ServerToHostProtocolHandler.java
@@ -268,6 +268,10 @@ public void execute(final OperationContext context, final ModelNode operation) t
                             // Acquire controller lock
                             context.acquireControllerLock();
                             // Check if the server is still in sync with the domain model
+                            // TODO this should involve shipping the resource tree to the server, which then compares
+                            // its local model. This would be done in the prepare phase of a transactional request.
+                            // The ResultHandler of this step would then publish the server's state, and register
+                            // the server's proxy controller with DomainModelControllerService
                             final byte param;
                             if(serverInventory.serverReconnected(serverName, channelHandler)) {
                                 param = DomainServerProtocol.PARAM_OK;