Merge branch 'web_backend_develope' of

https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope

Conflicts:
	src/com/platform/controller/DataModelController.java
	src/com/platform/oracle/OracleConnector.java
	src/com/platform/service/OracleExtractHelper.java
	src/com/platform/service/impl/OracleExtractServiceImpl.java

WebContent/WEB-INF/config/config.properties

@@ -4,7 +4,7 @@
 # 驱动程序
 jdbc.mysql.driver=com.mysql.jdbc.Driver
 # 连接url
-jdbc.mysql.url=jdbc:mysql://192.168.0.110:3306/ftpdata?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
 # 用户名
 jdbc.mysql.username=root
 # 密码
@@ -41,7 +41,7 @@ jdbc.minEvictableIdleTimeMillis=300000
 #
 #==============================================================================================================
 table-suffix=_20152016
-extract-log-localtion=/home/log/
+extract-log-localtion=D:\\log\\
 gather-tablespace-name=TS_TTSSS
 gather-tablespace-path=1
 gather-table-user-password=1

src/com/platform/controller/DataModelController.java

@@ -113,7 +113,7 @@ public class DataModelController extends BaseController{
 		String[] oraclesName = paramMap.get("oracleName");
 		if (oraclesName != null)
 			for (String rcName : oraclesName) {
-				Configs.CONSOLE_LOGGER.info("连接成功\t" + rcName);
+				Configs.CONSOLE_LOGGER.info("执行连接\t" + rcName);
 				new OracleStatusService().connectToOracle(rcName);
 			}
 		req.setStatus(200);

src/com/platform/kubernetes/SimpleKubeClient.java

@@ -4,6 +4,7 @@ import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.ContainerPort;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.ReplicationController;
+import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
@@ -32,18 +33,22 @@ public class SimpleKubeClient {
 	public SimpleKubeClient(Config config) {
 		Config cf = config;
 		if (null == config) {
-			cf = new ConfigBuilder().withMasterUrl(Configs.KUBE_MASTER_URL).build();
+			cf = new ConfigBuilder().withMasterUrl(Configs.KUBE_MASTER_URL)
+					.build();
 		}
+
 		this.client = new DefaultKubernetesClient(cf);
 	}
 
+	// RollingUpdatercline
+
 	public void updateOrAddReplicasLabelById(String namespace,
 			String resourceId, String key, String value) {
 		KubernetesClient kubeClient = client;
 		if (checkClientNull())
 			kubeClient = new DefaultKubernetesClient(Configs.KUBE_MASTER_URL);
 		kubeClient.replicationControllers().inNamespace(namespace)
-				.withName(resourceId).edit().editMetadata()
+				.withName(resourceId).rolling().edit().editMetadata()
 				.addToLabels(key, value).endMetadata().done();
 	}
 

src/com/platform/service/OracleStatusService.java

@@ -10,10 +10,13 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import org.apache.commons.lang.text.StrBuilder;
+
 import com.platform.entities.OracleConnectorParams;
 import com.platform.kubernetes.SimpleKubeClient;
 import com.platform.oracle.OracleConnector;
 import com.platform.utils.Configs;
+import com.platform.utils.Constant;
 
 public class OracleStatusService {
 	private static Map<String, Timer> alliveTask = new Hashtable<String, Timer>();
@@ -29,16 +32,24 @@ public class OracleStatusService {
 		OracleConnectorParams orp = new OracleConnectorParams();
 		Timer timer = new Timer();
 		alliveTask.put(replicasName, timer);
-		timer.schedule(new connectTask(replicasName, orp, sKubeClient), DELAY_TIME,
+		timer.schedule(new connectTask(replicasName, orp, sKubeClient),
-				INTERVAL_TIME);
+				DELAY_TIME, INTERVAL_TIME);
 
 	}
 
 	public void cancelToOracle(String replicasName, String operate) {
 		if (operate.equals("stop")) {
-			SimpleKubeClient sKubeClient = new SimpleKubeClient();
+			String cmd = "kubectl label --overwrite rc " + replicasName
-			sKubeClient.updateOrAddReplicasLabelById(replicasName, "status",
+					+ " status=0";
-					"0");
+			List<String> rList = Constant.ganymedSSH
+					.execCmdWaitAcquiescent(cmd);
+			StringBuffer sb = new StringBuffer();
+			for (String str : rList)
+				sb.append(str).append("\n");
+			Configs.CONSOLE_LOGGER.info(sb.toString());
+			// SimpleKubeClient sKubeClient = new SimpleKubeClient();
+			// sKubeClient.updateOrAddReplicasLabelById(replicasName,
+			// "status","0");
 		}
 		killAlliveTask(replicasName);
 	}
@@ -86,7 +97,8 @@ public class OracleStatusService {
 		private OracleConnectorParams ocp;
 		private SimpleKubeClient client;
 
-		public connectTask(String taskName, OracleConnectorParams ocp, SimpleKubeClient client){
+		public connectTask(String taskName, OracleConnectorParams ocp,
+				SimpleKubeClient client) {
 			this.taskName = taskName;
 			this.ocp = ocp;
 			this.count = 0;
@@ -102,12 +114,20 @@ public class OracleStatusService {
 
 		@Override
 		public void run() {
-			if (count == EXEC_TIME && alliveTask.containsKey(taskName)) { //如果任务已经执行10次，则任务oracle启动失败，并取消oracle连接
+			if (count == EXEC_TIME && alliveTask.containsKey(taskName)) { // 如果任务已经执行10次，则任务oracle启动失败，并取消oracle连接
 				killAlliveTask(taskName);
-				client.updateOrAddReplicasLabelById(taskName, "status", "1"); //更新ReplicationController标签，将oracle状态标示未1(0:启动中，1：失败，2：成功)
+				// client.updateOrAddReplicasLabelById(taskName, "status", "1");
+				// //更新ReplicationController标签，将oracle状态标示未1(0:启动中，1：失败，2：成功)
+				String cmd = "kubectl label --overwrite rc " + taskName
+						+ " status=1";
+				List<String> rList = Constant.ganymedSSH
+						.execCmdWaitAcquiescent(cmd);
+				StringBuffer sb = new StringBuffer();
+				for (String str : rList)
+					sb.append(str).append("\n");
 				Configs.CONSOLE_LOGGER.info("更新replicationController标签： "
 						+ taskName + "\t[标签更新为： 失败]");
-			} else { //否则，执行连接oracle任务，判断oracle是否启动成功
+			} else { // 否则，执行连接oracle任务，判断oracle是否启动成功
 				Pod pod = filterPod();
 				if (pod != null) {
 					String ip = client.getPodHostIp(pod);
@@ -115,15 +135,23 @@ public class OracleStatusService {
 					if (ip != null && port != 0) {
 						String url = "jdbc:oracle:thin:@" + ip + ":" + port
 								+ ":" + ocp.getDatabaseName();
-						boolean flag = OracleConnector.canConnect(url, //连接结果返回参数，true标示连接成功，false标示连接失败
+						boolean flag = OracleConnector.canConnect(url, // 连接结果返回参数，true标示连接成功，false标示连接失败
 								ocp.getUser(), ocp.getPassword());
 						Configs.CONSOLE_LOGGER.info("url:" + url + ",user:"
 								+ ocp.getUser() + ",password:"
 								+ ocp.getPassword());
 						String message = "失败";
 						if (flag && alliveTask.containsKey(taskName)) {
-							client.updateOrAddReplicasLabelById(taskName,
+							String cmd = "kubectl label --overwrite rc "
-									"status", "2");
+									+ taskName + " status=2";
+							// client.updateOrAddReplicasLabelById(taskNSyame,
+							// "status", "2");
+							List<String> rList = Constant.ganymedSSH
+									.execCmdWaitAcquiescent(cmd);
+							StringBuffer sb = new StringBuffer();
+							for (String str : rList)
+								sb.append(str).append("\n");
+							Configs.CONSOLE_LOGGER.info(sb.toString());
 							message = "成功";
 							killAlliveTask(taskName); // 连接成功，取消连接
 							Configs.CONSOLE_LOGGER
@@ -140,6 +168,7 @@ public class OracleStatusService {
 
 		/**
 		 * 获取oracle的连接ip地址和端口号
+		 * 
 		 * @return
 		 */
 		private Pod filterPod() {

src/com/platform/service/impl/OracleExtractServiceImpl.java

@@ -1,9 +1,7 @@
 package com.platform.service.impl;
 
 import java.sql.Connection;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import javax.annotation.Resource;
 
@@ -13,14 +11,14 @@ import com.base.Custom4exception;
 import com.base.CustomException;
 import com.platform.dao.DataInfoDao;
 import com.platform.entities.DataInfoEntity;
-import com.platform.entities.DataInfoEntityMoveTmp;
 import com.platform.entities.GatherOracleInfo;
 import com.platform.entities.OracleConnectorParams;
 import com.platform.kubernetes.SimpleKubeClient;
 import com.platform.oracle.OracleConnector;
 import com.platform.service.IOracleExtractService;
 import com.platform.service.OracleExtractHelper;
-import com.platform.utils.Bean2MapUtils;
+import com.platform.utils.Configs;
+import com.platform.utils.Constant;
 
 @Service(value = "OracleExtract")
 public class OracleExtractServiceImpl implements IOracleExtractService {
@@ -60,12 +58,27 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 					data.setExtractStatus(1);
 					dataInfoDao.updateExtract(data);
 					collectOracle.setName("J" + collectOracle.getName().replace("-", "_"));
+						String cmd = "kubectl label --overwrite rc "
+							+ collectOracle.getName() + " isExtract=1";
+					List<String> rList = Constant.ganymedSSH
+							.execCmdWaitAcquiescent(cmd);
+					StringBuffer sb = new StringBuffer();
+					for (String string : rList)
+						sb.append(string).append("\n");
+					Configs.CONSOLE_LOGGER.info(sb.toString());
 	//				client.updateOrAddReplicasLabelById(collectOracle.getName(), "isExtract", "1"); //更新oracle汇总状态，0标示为未汇总，1标示汇总中，2标示汇总完成
 					oracleExtract.createDBLink(conn, collectOracle); //创建dblink
 					oracleExtract.createTableSpace(conn, oracleModel); //创建表空间
 					oracleExtract.createUser(conn, collectOracle, oracleModel);//创建用户并授权
 					oracleExtract.extractColleDB(conn, collectOracle);//执行抽取
 	//				client.updateOrAddReplicasLabelById(collectOracle.getName(), "isExtract", "2"); //更新oracle汇总状态，0标示为未汇总，1标示汇总中，2标示汇总完成
+					cmd = "kubectl label --overwrite rc "
+							+ collectOracle.getName() + " isExtract=2";
+					rList = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+					sb = new StringBuffer();
+					for (String string : rList)
+						sb.append(string).append("\n");
+					Configs.CONSOLE_LOGGER.info(sb.toString());
 					data.setExtractStatus(2);
 					dataInfoDao.updateExtract(data);
 				}

src/com/platform/utils/Configs.java

@@ -21,7 +21,7 @@ public class Configs {
 
 	public static final Logger LOGGER = Logger.getLogger(Configs.class);
 
-	public static String KUBE_MASTER_URL = "http://192.168.0.113:8080/"; // kubernetes集群的maser
+	public static String KUBE_MASTER_URL = "http://192.168.0.110:8080/"; // kubernetes集群的maser
 																			// URl
 
 	public static int ORACLE_DEFAULT_PORT = 1521; // oracle的默认端口号
@@ -42,12 +42,11 @@ public class Configs {
 	
 	public static String TABLE_SUFFIX = "_20152016";  //汇总库汇总表的后缀名	
 	
-	public static String EXTRACT_LOG_LOCALTION = "C:\\log"; //数据汇总日志保存位置
+	public static String EXTRACT_LOG_LOCALTION = "D:\\log"; //数据汇总日志保存位置
 	
 	public static String GATHER_TABLESPACE_NAME=""; //表空间名
 	
 	public static String GATHER_TABLESPACE_PATH=""; //表空间路径
 	
 	public static String GATHER_TABLE_PASSWORD="1"; //登入密码
-	
 }