IGNITE-12211: Client connections system view (apache#6898)

nizhikov · web-flow · commit b67f2df77b96 · 2019-09-25T14:12:17.000+03:00
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
@@ -333,7 +333,8 @@ public void testGetAllView() throws Exception {
             "SCHEMAS",
             "TABLES",
             "TASKS",
-            "SERVICES"
+            "SERVICES",
+            "CLIENT_CONNECTIONS"
         ));
 
         Set<String> actViews = new HashSet<>();
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
@@ -342,7 +342,8 @@ public void testGetAllView() throws Exception {
                 "SYS.LOCAL_CACHE_GROUPS_IO",
                 "SYS.LOCAL_SQL_RUNNING_QUERIES",
                 "SYS.NODE_ATTRIBUTES",
-                "SYS.TABLES"
+                "SYS.TABLES",
+                "SYS.CLIENT_CONNECTIONS"
             ))
         );
     }
@@ -754,7 +755,13 @@ public void testGetAllColumns() throws Exception {
                 "SYS.TASKS.JOB_ID.null.2147483647",
                 "SYS.TASKS.AFFINITY_PARTITION_ID.null.10",
                 "SYS.TASKS.TASK_CLASS_NAME.null.2147483647",
-                "SYS.TASKS.EXEC_NAME.null.2147483647"
+                "SYS.TASKS.EXEC_NAME.null.2147483647",
+                "SYS.CLIENT_CONNECTIONS.CONNECTION_ID.null.19",
+                "SYS.CLIENT_CONNECTIONS.LOCAL_ADDRESS.null.2147483647",
+                "SYS.CLIENT_CONNECTIONS.REMOTE_ADDRESS.null.2147483647",
+                "SYS.CLIENT_CONNECTIONS.TYPE.null.2147483647",
+                "SYS.CLIENT_CONNECTIONS.USER.null.2147483647",
+                "SYS.CLIENT_CONNECTIONS.VERSION.null.2147483647"
             ));
 
             Assert.assertEquals(expectedCols, actualSystemCols);
diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java
@@ -34,6 +34,7 @@
 import java.util.function.ObjIntConsumer;
 import org.apache.ignite.internal.managers.systemview.walker.Order;
 import org.apache.ignite.spi.systemview.jmx.SystemViewMBean;
+import org.apache.ignite.spi.systemview.view.ClientConnectionView;
 import org.apache.ignite.spi.systemview.view.SystemView;
 import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker;
 import org.apache.ignite.spi.systemview.view.CacheGroupView;
@@ -73,6 +74,7 @@ public static void main(String[] args) throws Exception {
         gen.generateAndWrite(CacheView.class, DFLT_SRC_DIR);
         gen.generateAndWrite(ServiceView.class, DFLT_SRC_DIR);
         gen.generateAndWrite(ComputeTaskView.class, DFLT_SRC_DIR);
+        gen.generateAndWrite(ClientConnectionView.class, DFLT_SRC_DIR);
     }
 
     /**
@@ -110,8 +112,8 @@ private <T> Collection<String> generate(Class<T> clazz) {
         final List<String> code = new ArrayList<>();
         final Set<String> imports = new TreeSet<>();
 
-        imports.add("import " + SystemViewRowAttributeWalker.class.getName() + ';');
-        imports.add("import " + clazz.getName() + ';');
+        addImport(imports, SystemViewRowAttributeWalker.class);
+        addImport(imports, clazz);
 
         String simpleName = clazz.getSimpleName();
 
@@ -136,7 +138,7 @@ private <T> Collection<String> generate(Class<T> clazz) {
             String line = TAB + TAB;
 
             if (!retClazz.isPrimitive() && !retClazz.getName().startsWith("java.lang"))
-                imports.add("import " + retClazz.getName() + ';');
+                addImport(imports, retClazz);
 
             line += "v.accept(" + i + ", \"" + name + "\", " + retClazz.getSimpleName() + ".class);";
 
@@ -197,6 +199,11 @@ else if (retClazz == double.class)
         return code;
     }
 
+    /** Adds import to set imports set. */
+    private void addImport(Set<String> imports, Class<?> cls) {
+        imports.add("import " + cls.getName().replaceAll("\\$", ".") + ';');
+    }
+
     /**
      * Adds Apache License Header to the source code.
      *
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ProtocolVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ProtocolVersion.java
@@ -34,6 +34,9 @@ public final class ProtocolVersion implements Comparable<ProtocolVersion> {
     /** Protocol version 1.0.0. */
     public static final ProtocolVersion V1_0_0 = new ProtocolVersion((short)1, (short)0, (short)0);
 
+    /** Current protocol version. */
+    public static final ProtocolVersion CURRENT_VER = V1_5_0;
+
     /** Major. */
     private final short major;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
@@ -75,6 +75,7 @@
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
 import org.jetbrains.annotations.Nullable;
 
+import static org.apache.ignite.internal.client.thin.ProtocolVersion.CURRENT_VER;
 import static org.apache.ignite.internal.client.thin.ProtocolVersion.V1_0_0;
 import static org.apache.ignite.internal.client.thin.ProtocolVersion.V1_1_0;
 import static org.apache.ignite.internal.client.thin.ProtocolVersion.V1_2_0;
@@ -98,7 +99,7 @@ class TcpClientChannel implements ClientChannel {
     private static final long PAYLOAD_WAIT_TIMEOUT = 10L;
 
     /** Protocol version agreed with the server. */
-    private ProtocolVersion ver = V1_5_0;
+    private ProtocolVersion ver = CURRENT_VER;
 
     /** Channel. */
     private final Socket sock;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/GridSystemViewManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/GridSystemViewManager.java
@@ -31,12 +31,14 @@
 import org.apache.ignite.internal.managers.GridManagerAdapter;
 import org.apache.ignite.internal.managers.systemview.walker.CacheGroupViewWalker;
 import org.apache.ignite.internal.managers.systemview.walker.CacheViewWalker;
+import org.apache.ignite.internal.managers.systemview.walker.ClientConnectionViewWalker;
 import org.apache.ignite.internal.managers.systemview.walker.ComputeTaskViewWalker;
 import org.apache.ignite.internal.managers.systemview.walker.ServiceViewWalker;
 import org.apache.ignite.spi.systemview.ReadOnlySystemViewRegistry;
 import org.apache.ignite.spi.systemview.SystemViewExporterSpi;
 import org.apache.ignite.spi.systemview.view.CacheGroupView;
 import org.apache.ignite.spi.systemview.view.CacheView;
+import org.apache.ignite.spi.systemview.view.ClientConnectionView;
 import org.apache.ignite.spi.systemview.view.ComputeTaskView;
 import org.apache.ignite.spi.systemview.view.ServiceView;
 import org.apache.ignite.spi.systemview.view.SystemView;
@@ -73,6 +75,7 @@ public GridSystemViewManager(GridKernalContext ctx) {
         registerWalker(CacheView.class, new CacheViewWalker());
         registerWalker(ServiceView.class, new ServiceViewWalker());
         registerWalker(ComputeTaskView.class, new ComputeTaskViewWalker());
+        registerWalker(ClientConnectionView.class, new ClientConnectionViewWalker());
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClientConnectionViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClientConnectionViewWalker.java
@@ -0,0 +1,55 @@
+/*
+ * 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 org.apache.ignite.internal.managers.systemview.walker;
+
+import java.net.InetSocketAddress;
+import org.apache.ignite.spi.systemview.view.ClientConnectionView;
+import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker;
+
+/**
+ * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}.
+ * {@link ClientConnectionView} attributes walker.
+ * 
+ * @see ClientConnectionView
+ */
+public class ClientConnectionViewWalker implements SystemViewRowAttributeWalker<ClientConnectionView> {
+    /** {@inheritDoc} */
+    @Override public void visitAll(AttributeVisitor v) {
+        v.accept(0, "connectionId", long.class);
+        v.accept(1, "localAddress", InetSocketAddress.class);
+        v.accept(2, "remoteAddress", InetSocketAddress.class);
+        v.accept(3, "type", String.class);
+        v.accept(4, "user", String.class);
+        v.accept(5, "version", String.class);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void visitAll(ClientConnectionView row, AttributeWithValueVisitor v) {
+        v.acceptLong(0, "connectionId", row.connectionId());
+        v.accept(1, "localAddress", InetSocketAddress.class, row.localAddress());
+        v.accept(2, "remoteAddress", InetSocketAddress.class, row.remoteAddress());
+        v.accept(3, "type", String.class, row.type());
+        v.accept(4, "user", String.class, row.user());
+        v.accept(5, "version", String.class, row.version());
+    }
+
+    /** {@inheritDoc} */
+    @Override public int count() {
+        return 6;
+    }
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerAbstractConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerAbstractConnectionContext.java
@@ -52,6 +52,7 @@ public abstract class ClientListenerAbstractConnectionContext implements ClientL
      * Constructor.
      *
      * @param ctx Kernal context.
+     * @param connId Connection id.
      */
     protected ClientListenerAbstractConnectionContext(GridKernalContext ctx, long connId) {
         this.ctx = ctx;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java
@@ -52,16 +52,24 @@
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.mxbean.ClientProcessorMXBean;
 import org.apache.ignite.spi.IgnitePortProtocol;
+import org.apache.ignite.spi.systemview.view.ClientConnectionView;
 import org.apache.ignite.thread.IgniteThreadPoolExecutor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import static org.apache.ignite.internal.processors.metric.impl.MetricUtils.metricName;
 import static org.apache.ignite.internal.processors.odbc.ClientListenerNioListener.CONN_CTX_META_KEY;
 
 /**
  * Client connector processor.
  */
 public class ClientListenerProcessor extends GridProcessorAdapter {
+    /** */
+    public static final String CLI_CONN_SYS_VIEW = metricName("client", "connections");
+
+    /** */
+    public static final String CLI_CONN_SYS_VIEW_DESC = "Client connections";
+
     /** Default client connector configuration. */
     public static final ClientConnectorConfiguration DFLT_CLI_CFG = new ClientConnectorConfigurationEx();
 
@@ -191,6 +199,11 @@ public ClientListenerProcessor(GridKernalContext ctx) {
 
                 if (!U.IGNITE_MBEANS_DISABLED)
                     registerMBean();
+
+                ctx.systemView().registerView(CLI_CONN_SYS_VIEW, CLI_CONN_SYS_VIEW_DESC,
+                    ClientConnectionView.class,
+                    srv.sessions(),
+                    ClientConnectionView::new);
             }
             catch (Exception e) {
                 throw new IgniteCheckedException("Failed to start client connector processor.", e);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProtocolVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProtocolVersion.java
@@ -80,6 +80,13 @@ public short maintenance() {
         return maintenance;
     }
 
+    /**
+     * @return String representation of version.
+     */
+    public String asString() {
+        return String.valueOf(major) + '.' + minor + '.' + maintenance;
+    }
+
     /** {@inheritDoc} */
     @Override public int compareTo(@NotNull ClientListenerProtocolVersion other) {
         int res = major - other.major;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerRequestHandler.java
@@ -67,4 +67,7 @@ public interface ClientListenerRequestHandler {
      * @param reqId Request Id.
      */
     void unregisterRequest(long reqId);
+
+    /** @return Protocol version. */
+    ClientListenerProtocolVersion protocolVersion();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
@@ -65,7 +65,7 @@ public class JdbcConnectionContext extends ClientListenerAbstractConnectionConte
     static final ClientListenerProtocolVersion VER_2_8_0 = ClientListenerProtocolVersion.create(2, 8, 0);
 
     /** Current version. */
-    private static final ClientListenerProtocolVersion CURRENT_VER = VER_2_8_0;
+    public static final ClientListenerProtocolVersion CURRENT_VER = VER_2_8_0;
 
     /** Supported versions. */
     private static final Set<ClientListenerProtocolVersion> SUPPORTED_VERS = new HashSet<>();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
@@ -1485,4 +1485,9 @@ private JdbcResponse resultToResonse(JdbcResult res) {
     private static boolean isClientAffinityAwarenessApplicable(boolean partResRequested, PartitionResult partRes) {
         return partResRequested && (partRes == null || partRes.isClientAffinityAwarenessApplicable());
     }
+
+    /** {@inheritDoc} */
+    @Override public ClientListenerProtocolVersion protocolVersion() {
+        return protocolVer;
+    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
@@ -320,6 +320,11 @@ public void onDisconnect() {
         // No-op.
     }
 
+    /** {@inheritDoc} */
+    @Override public ClientListenerProtocolVersion protocolVersion() {
+        return ver;
+    }
+
     /**
      * Make query considering handler configuration.
      * @param schema Schema.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java
@@ -141,4 +141,9 @@ public class ClientRequestHandler implements ClientListenerRequestHandler {
     @Override public void unregisterRequest(long reqId) {
         // No-op.
     }
+
+    /** {@inheritDoc} */
+    @Override public ClientListenerProtocolVersion protocolVersion() {
+        return ver;
+    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/metric/SqlViewExporterSpiTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/metric/SqlViewExporterSpiTest.java

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ public abstract class ClientListenerAbstractConnectionContext implements ClientL`
`52`	`52`	`* Constructor.`
`53`	`53`	`*`
`54`	`54`	`* @param ctx Kernal context.`
	`55`	`+ * @param connId Connection id.`
`55`	`56`	`*/`
`56`	`57`	`protected ClientListenerAbstractConnectionContext(GridKernalContext ctx, long connId) {`
`57`	`58`	`this.ctx = ctx;`