GG-27348 Implemented support for Ent/Ult agent. (apache#897)

(cherry picked from commit b0c119c)

modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java

@@ -49,9 +49,9 @@
 import org.apache.ignite.internal.processors.diagnostic.DiagnosticProcessor;
 import org.apache.ignite.internal.processors.failure.FailureProcessor;
 import org.apache.ignite.internal.processors.localtask.DurableBackgroundTasksProcessor;
-import org.apache.ignite.internal.processors.management.ManagementConsoleProcessorAdapter;
 import org.apache.ignite.internal.processors.job.GridJobProcessor;
 import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor;
+import org.apache.ignite.internal.processors.management.ManagementConsoleProcessor;
 import org.apache.ignite.internal.processors.marshaller.GridMarshallerMappingProcessor;
 import org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage;
 import org.apache.ignite.internal.processors.metric.GridMetricManager;
@@ -751,7 +751,7 @@ public interface GridKernalContext extends Iterable<GridComponent> {
     /**
      * @return Control Center processor.
      */
-    public ManagementConsoleProcessorAdapter managementConsole();
+    public ManagementConsoleProcessor managementConsole();
 
     /**
      * @return Local continuous tasks processor.

modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java

@@ -67,7 +67,7 @@
 import org.apache.ignite.internal.processors.diagnostic.DiagnosticProcessor;
 import org.apache.ignite.internal.processors.failure.FailureProcessor;
 import org.apache.ignite.internal.processors.localtask.DurableBackgroundTasksProcessor;
-import org.apache.ignite.internal.processors.management.ManagementConsoleProcessorAdapter;
+import org.apache.ignite.internal.processors.management.ManagementConsoleProcessor;
 import org.apache.ignite.internal.processors.job.GridJobProcessor;
 import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor;
 import org.apache.ignite.internal.processors.marshaller.GridMarshallerMappingProcessor;
@@ -331,7 +331,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
 
     /** */
     @GridToStringExclude
-    private ManagementConsoleProcessorAdapter mgmtConsoleProc;
+    private ManagementConsoleProcessor mgmtConsoleProc;
 
     /** */
     @GridToStringExclude
@@ -703,8 +703,8 @@ else if (comp instanceof DiagnosticProcessor)
             diagnosticProcessor = (DiagnosticProcessor)comp;
         else if (comp instanceof RollingUpgradeProcessor)
             rollingUpgradeProc = (RollingUpgradeProcessor)comp;
-        else if (comp instanceof ManagementConsoleProcessorAdapter)
-            mgmtConsoleProc = (ManagementConsoleProcessorAdapter)comp;
+        else if (comp instanceof ManagementConsoleProcessor)
+            mgmtConsoleProc = (ManagementConsoleProcessor)comp;
         else if (comp instanceof DurableBackgroundTasksProcessor)
             durableBackgroundTasksProcessor = (DurableBackgroundTasksProcessor)comp;
         else if (!(comp instanceof DiscoveryNodeValidationProcessor
@@ -1290,7 +1290,7 @@ public void recoveryMode(boolean recoveryMode) {
     }
 
     /** {@inheritDoc} */
-    @Override public ManagementConsoleProcessorAdapter managementConsole() {
+    @Override public ManagementConsoleProcessor managementConsole() {
         return mgmtConsoleProc;
     }
 

modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java

@@ -110,10 +110,10 @@ public enum IgniteComponentType {
         "ignite-opencensus"
     ),
 
-    /** Control Center. */
+    /** Control Center agent. */
     MANAGEMENT_CONSOLE(
         NoopManagementConsoleProcessor.class.getName(),
-        "org.apache.ignite.agent.ManagementConsoleProcessor",
+        "org.apache.ignite.agent.ManagementConsoleAgent",
         "ignite-management-console-agent",
         "org.apache.ignite.agent.processor.metrics.MetricsExporterMessageFactory"
     );

modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java

@@ -151,6 +151,7 @@
 import org.apache.ignite.internal.processors.job.GridJobProcessor;
 import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor;
 import org.apache.ignite.internal.processors.localtask.DurableBackgroundTasksProcessor;
+import org.apache.ignite.internal.processors.management.ManagementConsoleProcessor;
 import org.apache.ignite.internal.processors.marshaller.GridMarshallerMappingProcessor;
 import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageImpl;
 import org.apache.ignite.internal.processors.metric.GridMetricManager;
@@ -1160,7 +1161,7 @@ public void start(
                 startProcessor(new GridTaskSessionProcessor(ctx));
                 startProcessor(new GridJobProcessor(ctx));
                 startProcessor(new GridTaskProcessor(ctx));
-                startProcessor((GridProcessor)SCHEDULE.createOptional(ctx));
+                startProcessor(SCHEDULE.createOptional(ctx));
                 startProcessor(new GridRestProcessor(ctx));
                 startProcessor(new DataStreamProcessor(ctx));
                 startProcessor(new GridContinuousProcessor(ctx));
@@ -1172,7 +1173,7 @@ public void start(
                     startProcessor(new DistributedMetaStorageImpl(ctx));
 
                 startProcessor(new DistributedConfigurationProcessor(ctx));
-                startProcessor(MANAGEMENT_CONSOLE.createOptional(ctx));
+                startProcessor(createComponent(ManagementConsoleProcessor.class, ctx));
                 startProcessor(new DurableBackgroundTasksProcessor(ctx));
 
                 // Start transactional data replication processor.
@@ -4253,9 +4254,12 @@ private static <T extends GridComponent> T createComponent(Class<T> cls, GridKer
         if (cls.equals(TransactionalDrProcessor.class))
             return (T)new NoOpTransactionalDrProcessor(ctx);
 
-        if(cls.equals(GridSecurityProcessor.class))
+        if (cls.equals(GridSecurityProcessor.class))
             return null;
 
+        if (cls.equals(ManagementConsoleProcessor.class))
+            return MANAGEMENT_CONSOLE.createOptional(ctx);
+
         Class<T> implCls = null;
 
         try {
@@ -4422,7 +4426,7 @@ void waitPreviousReconnect() {
                 try {
                     reconnectDone.get();
                 }
-                catch (IgniteCheckedException ignote) {
+                catch (IgniteCheckedException ignored) {
                     // No-op.
                 }
             }

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java

@@ -65,9 +65,9 @@
 import org.apache.ignite.internal.processors.diagnostic.DiagnosticProcessor;
 import org.apache.ignite.internal.processors.failure.FailureProcessor;
 import org.apache.ignite.internal.processors.localtask.DurableBackgroundTasksProcessor;
-import org.apache.ignite.internal.processors.management.ManagementConsoleProcessorAdapter;
 import org.apache.ignite.internal.processors.job.GridJobProcessor;
 import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor;
+import org.apache.ignite.internal.processors.management.ManagementConsoleProcessor;
 import org.apache.ignite.internal.processors.marshaller.GridMarshallerMappingProcessor;
 import org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage;
 import org.apache.ignite.internal.processors.metric.GridMetricManager;
@@ -718,7 +718,7 @@ protected IgniteConfiguration prepareIgniteConfiguration() {
     }
 
     /** {@inheritDoc} */
-    @Override public ManagementConsoleProcessorAdapter managementConsole() {
+    @Override public ManagementConsoleProcessor managementConsole() {
         return null;
     }
 

modules/core/src/main/java/org/apache/ignite/internal/processors/management/ManagementConfiguration.java

@@ -90,86 +90,86 @@ public ManagementConfiguration setEnabled(boolean enabled) {
     }
 
     /**
-     * @return Server URI.
+     * @return Control Center URI.
      */
     public List<String> getConsoleUris() {
         return consoleUris;
     }
 
     /**
-     * @param srvUri URI.
+     * @param consoleUris URI.
      * @return {@code this} for chaining.
      */
-    public ManagementConfiguration setConsoleUris(List<String> srvUri) {
-        this.consoleUris = srvUri;
+    public ManagementConfiguration setConsoleUris(List<String> consoleUris) {
+        this.consoleUris = consoleUris;
 
         return this;
     }
 
     /**
-     * @return Server key store.
+     * @return Control Center key store.
      */
     public String getConsoleKeyStore() {
         return consoleKeyStore;
     }
 
     /**
-     * @param srvKeyStore Server key store.
+     * @param consoleKeyStore Control Center key store.
      * @return {@code this} for chaining.
      */
-    public ManagementConfiguration setConsoleKeyStore(String srvKeyStore) {
-        this.consoleKeyStore = srvKeyStore;
+    public ManagementConfiguration setConsoleKeyStore(String consoleKeyStore) {
+        this.consoleKeyStore = consoleKeyStore;
 
         return this;
     }
 
     /**
-     * @return Server key store password.
+     * @return Control Center key store password.
      */
     public String getConsoleKeyStorePassword() {
         return consoleKeyStorePass;
     }
 
     /**
-     * @param srvKeyStorePass Server key store password.
+     * @param consoleKeyStorePass Control Center key store password.
      * @return {@code this} for chaining.
      */
-    public ManagementConfiguration setConsoleKeyStorePassword(String srvKeyStorePass) {
-        this.consoleKeyStorePass = srvKeyStorePass;
+    public ManagementConfiguration setConsoleKeyStorePassword(String consoleKeyStorePass) {
+        this.consoleKeyStorePass = consoleKeyStorePass;
 
         return this;
     }
 
     /**
-     * @return Server trust store.
+     * @return Control Center trust store.
      */
     public String getConsoleTrustStore() {
         return consoleTrustStore;
     }
 
     /**
-     * @param srvTrustStore Path to server trust store.
+     * @param consoleTrustStore Path to Control Center trust store.
      * @return {@code this} for chaining.
      */
-    public ManagementConfiguration setConsoleTrustStore(String srvTrustStore) {
-        this.consoleTrustStore = srvTrustStore;
+    public ManagementConfiguration setConsoleTrustStore(String consoleTrustStore) {
+        this.consoleTrustStore = consoleTrustStore;
 
         return this;
     }
 
     /**
-     * @return Server trust store password.
+     * @return Control Center trust store password.
      */
     public String getConsoleTrustStorePassword() {
         return consoleTrustStorePass;
     }
 
     /**
-     * @param srvTrustStorePass Server trust store password.
+     * @param consoleTrustStorePass Console trust store password.
      * @return {@code this} for chaining.
      */
-    public ManagementConfiguration setConsoleTrustStorePassword(String srvTrustStorePass) {
-        this.consoleTrustStorePass = srvTrustStorePass;
+    public ManagementConfiguration setConsoleTrustStorePassword(String consoleTrustStorePass) {
+        this.consoleTrustStorePass = consoleTrustStorePass;
 
         return this;
     }
@@ -199,10 +199,11 @@ public long getSecuritySessionTimeout() {
     }
 
     /**
-     * @param sesTimeout Session timeout in milliseconds.
+     * @param securitySesTimeout Session timeout in milliseconds.
      */
-    public ManagementConfiguration setSecuritySessionTimeout(long sesTimeout) {
-        this.securitySesTimeout = sesTimeout;
+    public ManagementConfiguration setSecuritySessionTimeout(long securitySesTimeout) {
+        this.securitySesTimeout = securitySesTimeout;
+
         return this;
     }
 
@@ -214,10 +215,11 @@ public long getSecuritySessionExpirationTimeout() {
     }
 
     /**
-     * @param sesExpirationTimeout Session expiration timeout.
+     * @param securitySesExpirationTimeout Session expiration timeout.
      */
-    public ManagementConfiguration setSecuritySessionExpirationTimeout(long sesExpirationTimeout) {
-        this.securitySesExpirationTimeout = sesExpirationTimeout;
+    public ManagementConfiguration setSecuritySessionExpirationTimeout(long securitySesExpirationTimeout) {
+        this.securitySesExpirationTimeout = securitySesExpirationTimeout;
+
         return this;
     }
 

modules/core/src/main/java/org/apache/ignite/internal/processors/management/ManagementConsoleProcessorAdapter.java → modules/core/src/main/java/org/apache/ignite/internal/processors/management/ManagementConsoleProcessor.java

@@ -16,38 +16,23 @@
 
 package org.apache.ignite.internal.processors.management;
 
-import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.GridProcessor;
 
 /**
- * No-op implementation of Control Center agent, throws exception on usage attempt.
+ * Control Center processor.
  */
-public abstract class ManagementConsoleProcessorAdapter extends GridProcessorAdapter {
-    /** Management configuration instance. */
-    protected ManagementConfiguration cfg = new ManagementConfiguration();
-
-    /**
-     * @param ctx Kernal context.
-     */
-    protected ManagementConsoleProcessorAdapter(GridKernalContext ctx) {
-        super(ctx);
-    }
-
+public interface ManagementConsoleProcessor extends GridProcessor {
     /**
      * Sets the configuration.
      *
      * @param cfg Management configuration instance.
      */
-    public void configuration(ManagementConfiguration cfg) {
-        this.cfg = cfg;
-    }
+    public void configuration(ManagementConfiguration cfg);
 
     /**
      * Gets the configuration.
      *
      * @return Management configuration instance.
      */
-    public ManagementConfiguration configuration() {
-        return cfg;
-    }
+    public ManagementConfiguration configuration();
 }

modules/core/src/main/java/org/apache/ignite/internal/processors/management/NoopManagementConsoleProcessor.java

@@ -17,15 +17,26 @@
 package org.apache.ignite.internal.processors.management;
 
 import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
 
 /**
  * No-op Control Center processor.
  */
-public class NoopManagementConsoleProcessor extends ManagementConsoleProcessorAdapter {
+public class NoopManagementConsoleProcessor extends GridProcessorAdapter implements ManagementConsoleProcessor {
     /**
      * @param ctx Kernal context.
      */
     public NoopManagementConsoleProcessor(GridKernalContext ctx) {
         super(ctx);
     }
+
+    /** {@inheritDoc} */
+    @Override public void configuration(ManagementConfiguration cfg) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public ManagementConfiguration configuration() {
+        return null;
+    }
 }

modules/core/src/main/java/org/apache/ignite/internal/visor/management/ChangeManagementConfigurationTask.java

@@ -18,7 +18,7 @@
 
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.internal.processors.management.ManagementConfiguration;
-import org.apache.ignite.internal.processors.management.ManagementConsoleProcessorAdapter;
+import org.apache.ignite.internal.processors.management.ManagementConsoleProcessor;
 import org.apache.ignite.internal.processors.task.GridInternal;
 import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.util.typedef.internal.S;
@@ -58,12 +58,12 @@ private static class ChangeManagementConfigurationJob extends VisorJob<Managemen
 
         /** {@inheritDoc} */
         @Override protected ManagementConfiguration run(ManagementConfiguration cfg) throws IgniteException {
-            ManagementConsoleProcessorAdapter processor = ignite.context().managementConsole();
+            ManagementConsoleProcessor mgmtProc = ignite.context().managementConsole();
 
-            if (cfg != null && !cfg.equals(processor.configuration()))
-                processor.configuration(cfg);
+            if (cfg != null && !cfg.equals(mgmtProc.configuration()))
+                mgmtProc.configuration(cfg);
 
-            return processor.configuration();
+            return mgmtProc.configuration();
         }
 
         /** {@inheritDoc} */