Merge pull request #2 from griddb/5.3-rc

Update for 5.3

README.md

@@ -10,9 +10,9 @@ Building and program execution are checked in the environment below.
 
     OS: CentOS 7.9 (x64)
     Java: Java™ SE Development Kit 8
-    GridDB Server: V4.6.1/V5.0 CE (Community Edition)
-    GridDB Java Client: V4.6.1 CE (Community Edition)
-    GridDB JDBC: V4.6.0 CE (Community Edition)
+    GridDB Server: V4.6.1/V5.3.0 CE (Community Edition)
+    GridDB Java Client: V4.6.1/V5.3.0 CE (Community Edition)
+    GridDB JDBC: V4.6.0/V5.3.0 CE (Community Edition)
 
 ## Quick start - Build and Run
 

bin/gs_expimp.properties

@@ -22,8 +22,12 @@ jdbcLoginTimeout=10
 
 storeBlockSize=64KB
 maxJobBufferSize=512
+load.input.threadNum=1
+load.output.threadNum=1
 
 # for debug
 restAddress=127.0.0.1
 restPort=10040
-maxJobSize=2
+maxJobSize=2
+# for intervals option
+intervalTimeZone=GMT

common/build.gradle

@@ -13,7 +13,7 @@ sourceSets {
     }
 }
 
-def gridstoreVersion = '4.6.1'
+def gridstoreVersion = '5.3.0'
 
 dependencies { 
     implementation 'commons-io:commons-io:2.4'

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

@@ -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/GridStoreWebAPI.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.
 		 */