Merge pull request #1 from griddb/5.3-rc

Update for 5.3

Author: AnggaSuherman

README.md

@@ -10,9 +10,9 @@ The GridDB CLI provides command line interface tool to manage GridDB cluster ope
 
 Building and program execution are checked in the environment below.
 
-    OS: CentOS 7.9(x64) / Ubuntu 20.04
-    GridDB Server: V5.0 CE(Community Edition)
-    Java: Java™ SE Development Kit 8
+    OS: CentOS 7.9(x64)
+    GridDB Server: V5.3 CE(Community Edition)
+    Java: Java™ SE Development Kit 11 (OpenJDK 11.0.19)
 
 ## Quick start from CLI Source Code
 
@@ -44,7 +44,7 @@ and the following file is created under `release/` folder.
   Run GridDB CLI after build with ant:
 
     $ CP=.
-    $ CP=$CP:common/lib/commons-io-2.4.jar:release/griddb-cli.jar:common/lib/gridstore.jar:common/lib/gridstore-jdbc.jar:common/lib/jackson-annotations-2.2.3.jar:common/lib/jackson-core-2.2.3.jar:common/lib/jackson-databind-2.2.3.jar:common/lib/javax.json-1.0.jar:common/lib/jersey-client-1.17.1.jar:common/lib/jersey-core-1.17.1.jar:common/lib/orion-ssh2-214.jar:lib/commons-beanutils-1.9.3.jar:lib/commons-cli-1.2.jar:lib/commons-collections-3.2.2.jar:lib/commons-lang3-3.5.jar:lib/commons-logging-1.2.jar:lib/jline-3.17.1.jar:lib/logback-classic-1.0.13.jar:lib/logback-core-1.0.13.jar:lib/opencsv-3.9.jar:lib/slf4j-api-1.7.5.jar
+    $ CP=$CP:common/lib/commons-io-2.4.jar:release/griddb-cli.jar:common/lib/gridstore.jar:common/lib/gridstore-jdbc.jar:common/lib/jackson-annotations-2.2.3.jar:common/lib/jackson-core-2.2.3.jar:common/lib/jackson-databind-2.2.3.jar:common/lib/javax.json-1.0.jar:common/lib/jersey-client-1.17.1.jar:common/lib/jersey-core-1.17.1.jar:common/lib/orion-ssh2-214.jar:lib/commons-beanutils-1.9.3.jar:lib/commons-cli-1.2.jar:lib/commons-collections-3.2.2.jar:lib/commons-lang3-3.5.jar:lib/commons-logging-1.2.jar:lib/jline-3.21.0.jar:lib/logback-classic-1.0.13.jar:lib/logback-core-1.0.13.jar:lib/opencsv-3.9.jar:lib/slf4j-api-1.7.5.jar
     $ java -Xmx1024m -Dlogback.configurationFile=gs_sh_logback.xml -classpath "$CP:$CLASSPATH"  com.toshiba.mwcloud.gs.tools.shell.GridStoreShell $*
     gs> version
     gs_sh-ce version 5.0.0

Specification_en.md

@@ -15,8 +15,8 @@ sourceSets {
     }
 }
 
-def gridstoreVersion = '5.0.0'
-def gridstoreJdbcVersion = '5.0.0'
+def gridstoreVersion = '5.3.0'
+def gridstoreJdbcVersion = '5.3.0'
 
 repositories {
     mavenCentral()
@@ -40,6 +40,7 @@ dependencies {
     implementation 'com.github.griddb:gridstore:' + "${gridstoreVersion}"
     implementation 'com.github.griddb:gridstore-jdbc:' + "${gridstoreJdbcVersion}"
     implementation project(":griddb-tools-common")
+
 }
 
 jar {

Specification_ja.md

@@ -12,8 +12,8 @@ sourceSets {
     }
 }
 
-def gridstoreVersion = '5.0.0'
-def gridstoreJdbcVersion = '5.0.0'
+def gridstoreVersion = '5.3.0'
+def gridstoreJdbcVersion = '5.3.0'
 
 dependencies { 
     implementation 'commons-io:commons-io:2.4'

build.gradle

@@ -0,0 +1,25 @@
+/*
+ 	Copyright (c) 2021 TOSHIBA Digital Solutions Corporation.
+    Licensed 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 com.toshiba.mwcloud.gs.tools.common;
+
+/**
+ * 認証方式(内部認証/LDAP認証)
+ * <p>
+ * LDAP,INTERNAL
+ *
+ */
+public enum AuthenticationMethod {
+	LDAP,
+	INTERNAL
+}

common/build.gradle

@@ -13,6 +13,8 @@
 
 package com.toshiba.mwcloud.gs.tools.common;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -755,6 +757,8 @@ public Boolean call() throws Exception {
 		int countService = 0;
 		boolean result = true;
 		boolean initFlag = true;
+		// Get list of node in the cluster as IP Address (get from configuration file)
+		List<NodeKey> nodesIPAddress = getNodesWithIPAddress(cluster.getNodes());
 
 		// ノードごとのステータス数などの計算
 		for ( T obj : cluster.getNodes() ){
@@ -790,7 +794,8 @@ public Boolean call() throws Exception {
 					.convertValue(followers, NodeKey[].class);
 
 				for ( NodeKey nkey : followerKeys ){
-					if ( cluster.getNode(nkey) == null ){
+					// Check node information get from API "/node/host" with node information get from configuration file
+					if (!nodesIPAddress.contains(nkey)) {
 						// 定義には含まれていない
 						List<GSNode> undefNodes = clStat.getUndefinedNodes();
 						if ( undefNodes == null ){
@@ -838,6 +843,44 @@ public Boolean call() throws Exception {
 		return result;
 	}
 
+	/**
+	 * Convert the address of NodeKey from host name to IPAddress
+	 *
+	 * @param nodeKey node with host name
+	 * @return nodeKey node with IP Address
+	 * @throws GridStoreCommandException if host name and IP Address not found in the /etc/hosts
+	 */
+	private static NodeKey convertHostnameToIPAddress(NodeKey nodeKey) throws GridStoreCommandException {
+		InetAddress inet = null;
+		NodeKey nodeKeyWithIPAddress = null;
+		try {
+			inet = InetAddress.getByName(nodeKey.getAddress());
+			nodeKeyWithIPAddress = new NodeKey(inet.getHostAddress(), nodeKey.getPort());
+		} catch (UnknownHostException e) {
+			throw new GridStoreCommandException("D10137: Failed to get node status. ("+e.getMessage()+")", e);
+		}
+		return nodeKeyWithIPAddress;
+	}
+
+	/**
+	 * Get list of node in the cluster as IP Address
+	 *
+	 * @param <T> generic type
+	 * @param nodes list of nodes in the config file
+	 * @return list of node in the cluster with IP Address
+	 * @throws GridStoreCommandException
+	 */
+	private static <T> List<NodeKey> getNodesWithIPAddress(List<T> nodes) throws GridStoreCommandException {
+		List<NodeKey> nodesIPAddress = new ArrayList<NodeKey>();
+		for (T obj : nodes) {
+			GSNode node = (GSNode) obj;
+			NodeKey nodeKey = new NodeKey(node.getAddress(), node.getPort());
+			nodesIPAddress.add(convertHostnameToIPAddress(nodeKey));
+		}
+		return nodesIPAddress;
+	}
+
+
 	/**
 	 * Get cluster configuration information.
 	 *

common/src/com/toshiba/mwcloud/gs/tools/common/AuthenticationMethod.java

@@ -400,7 +400,7 @@ public static class PartitionInfo {
 		/**
 		 * Maximum Log Sequence Number.
 		 */
-		public int maxLsn;
+		public long maxLsn;
 	}
 
 	/**
@@ -415,7 +415,7 @@ public static class NodeKeyPartition {
 		/**
 		 * Log Sequence Number.
 		 */
-		public int lsn;
+		public long lsn;
 		/**
 		 * Node port.
 		 */

common/src/com/toshiba/mwcloud/gs/tools/common/GridStoreCommandUtils.java

@@ -0,0 +1,26 @@
+/*
+ 	Copyright (c) 2021 TOSHIBA Digital Solutions Corporation.
+    Licensed 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 com.toshiba.mwcloud.gs.tools.common;
+
+/**
+ * SSL接続設定
+ * <p>
+ * DISABLED,PREFERRED,VERIFY
+ *
+ */
+public enum SslMode {
+	DISABLED,
+	PREFERRED,
+	VERIFY
+}