innov
/
aggregation-platform
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

---修改kube与后台不在同机器上不能运行Bug

Browse Source
web_backend_develope
wu ming 9 years ago
parent 234a57c005
commit 83b3c8975a
9 changed files with 374 additions and 306 deletions
Show Stats Download Patch File Download Diff File

55
WebContent/WEB-INF/config/config.properties
Unescape View File

@ -56,6 +56,7 @@ gather-table-user-password=user
#kuber's url must exist
kubeMasterUrl=http://192.168.0.110:8080/
kubeMasterAddress=192.168.0.110:8080
collect-user-name=system
collect-password=oracle
@ -85,34 +86,34 @@ oracle-psw=oracle
# windows path
#=============================================================================================================
#extract-log-localtion=D:\\test\\log\\
#extract-standard-log-localtion=D:\\test\\log2\\
#
#file_upload_path=D:\\test\\
#file_download_path=D:\\test\\export.xlsx
#
#package_download_path=D:\\test\\
#package_name=sql_script_standard
#
#sql_script_path_last=D:\\test\\sql_script_last\\
#sql_script_path_standard=D:\\test\\sql_script_standard\\
extract-log-localtion=D:\\test\\log\\
extract-standard-log-localtion=D:\\test\\log2\\
file_upload_path=D:\\test\\
file_download_path=D:\\test\\export.xlsx
package_download_path=D:\\test\\
package_name=sql_script_standard
sql_script_path_last=D:\\test\\sql_script_last\\
sql_script_path_standard=D:\\test\\sql_script_standard\\
#=============================================================================================================
# linux path
#=============================================================================================================
# extract's log file location
extract-log-localtion=/home/web_manage/log/
# standard extract's log file location
extract-standard-log-localtion=/home/web_manage/log2/
#import excel file's location
file_upload_path=/excel_import_dir/
#export excel file's location
file_download_path=/excel_export_dir/export.xlsx
#file package download's location
package_download_path=/
#file package's name
package_name=DefaultDescription
#location of sql script lastest
sql_script_path_last=/DefaultDescription_last/
#location of sql script standard
sql_script_path_standard=/DefaultDescription/
## extract's log file location
#extract-log-localtion=/home/web_manage/log/
## standard extract's log file location
#extract-standard-log-localtion=/home/web_manage/log2/
##import excel file's location
#file_upload_path=/excel_import_dir/
##export excel file's location
#file_download_path=/excel_export_dir/export.xlsx
##file package download's location
#package_download_path=/
##file package's name
#package_name=DefaultDescription
##location of sql script lastest
#sql_script_path_last=/DefaultDescription_last/
##location of sql script standard
#sql_script_path_standard=/DefaultDescription/

24
src/com/platform/controller/DataModelController.java
Unescape View File

@ -42,6 +42,7 @@ import com.platform.service.IVolumeService;
import com.platform.service.OracleExtractTask;
import com.platform.service.OracleStatusService;
import com.platform.utils.CacheSetCantDelete;
import com.platform.utils.Configs;
import com.platform.utils.Constant;
import com.platform.utils.ThreadVolumeImm;
import com.platform.utils.UtilsHelper;
@ -109,7 +110,7 @@ public class DataModelController extends BaseController {
* @param res
* @param req
* @return
* @throws Exception
* @throws Exception
*/
@RequestMapping("/data.json")
@ResponseBody
@ -159,11 +160,11 @@ public class DataModelController extends BaseController {
if (null != data && data.length > 0) {
List<String> list = new ArrayList<String>();
List<String> errList = new ArrayList<String>();
//判断是否有 不能删除的。
// 判断是否有 不能删除的。
for (String dataId : data) {
if(CacheSetCantDelete.containsId(dataId))
if (CacheSetCantDelete.containsId(dataId))
errList.add(dataId);
else
else
list.add(dataId);
}
if (list.size() > 0) {
@ -175,7 +176,7 @@ public class DataModelController extends BaseController {
mode.put("err", errList);
req.setStatus(500);
}
}
return mode;
}
@ -196,8 +197,8 @@ public class DataModelController extends BaseController {
if (oraclesName != null)
for (String rcName : oraclesName) {
log.info("执行连接\t" + rcName);
String cmd = "kubectl label --overwrite rc " + rcName
+ " status=0";
String cmd = "kubectl --server " + Configs.KUBE_MASTER_ADDRESS
+ " label --overwrite rc " + rcName + " status=0";
List<String> rList = Constant.ganymedSSH
.execCmdWaitAcquiescent(cmd);
StringBuffer sb = new StringBuffer();
@ -243,7 +244,8 @@ public class DataModelController extends BaseController {
public String volumeList() throws Exception {
log.info("-----/volume/list------");
String rest = volumeService.getAllvolume();
new ThreadVolumeImm("ThreadVolumeImm-in-VolumeController-volumeList").start();
new ThreadVolumeImm("ThreadVolumeImm-in-VolumeController-volumeList")
.start();
return rest;
}
@ -292,7 +294,7 @@ public class DataModelController extends BaseController {
if (isConnect) {
req.setStatus(200);
if (null != form.getInneed() && form.getInneed().size() > 0) {
for (OracleConnectorParams oracleParams : form.getInneed()) {
for (OracleConnectorParams oracleParams : form.getInneed()) {
BasedTask task = new OracleExtractTask(
oracleParams.getName(), form.getTarget(),
oracleParams, OracleExtract);
@ -462,10 +464,10 @@ public class DataModelController extends BaseController {
public Object getExtractLog(@RequestParam("rcName") String name,
HttpServletRequest res, HttpServletResponse req) throws Exception {
log.info("---------/oracle/extract/log-------------------");
String result = logReadService.readLog(name);
String result = logReadService.readLog(name);
// "查看相应日志"
Map<String, String> log = new HashMap<String, String>();
log.put(name, result+"\r\n");
log.put(name, result + "\r\n");
return log;
}
}

13
src/com/platform/oracle/OracleConnector.java
Unescape View File

@ -58,7 +58,18 @@ public class OracleConnector {
} catch (CustomException e) {
log.error(Custom4exception.OracleSQL_Except, e);
}
return (null != result);
if(null != result){
try {
result.close();
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return true;
}
else{
return false;
}
}
public synchronized static ResultSet getSQLExecResultSet(Connection conn,

7
src/com/platform/service/OracleExtractTask.java
Unescape View File

@ -51,7 +51,8 @@ public class OracleExtractTask extends AbstractOracleExtractTask {
createConnectUrl(), gatherOracleInfo.getUser(),
gatherOracleInfo.getPassword(), oc);
if (null != conn) {
String cmd = "kubectl label --overwrite rc " + oc.getName()
String cmd = "kubectl --server " + Configs.KUBE_MASTER_ADDRESS
+ " label --overwrite rc " + oc.getName()
+ " isExtract=1";
OracleExtract.updateDataExtractStatus(oc, 1); // 更新数据库的状态
FileOperateHelper
@ -72,7 +73,8 @@ public class OracleExtractTask extends AbstractOracleExtractTask {
oracleExtract.createTableSpace(conn, oc, gatherOracleInfo); // 创建表空间
oracleExtract.createUser(conn, oc, gatherOracleInfo);// 创建用户并授权
oracleExtract.extractColleDB(conn, oc, gatherOracleInfo);// 执行抽取
cmd = "kubectl label --overwrite rc " + oc.getName()
cmd = "kubectl --server " + Configs.KUBE_MASTER_ADDRESS
+ " label --overwrite rc " + oc.getName()
+ " isExtract=2";
rList = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
sb = new StringBuffer();
@ -88,6 +90,7 @@ public class OracleExtractTask extends AbstractOracleExtractTask {
.date2StringBysecond(new Date())
+ "]>>>>>>>>>>>>>>>>汇总结束 >>>>>>>>>>>>>>>>>>\r\n\r\n");
OracleExtract.updateDataExtractStatus(oc, 2); // 更新数据库的状态
conn.close(); // 关闭连接
}
} catch (Exception e) {
log.error(Custom4exception.OracleSQL_Except, e);

20
src/com/platform/service/OracleStatusService.java
Unescape View File

@ -16,9 +16,11 @@ import com.platform.oracle.OracleConnector;
import com.platform.utils.Configs;
import com.platform.utils.Constant;
/** 计时 尝试连接oracle的时间，（超过10分钟判断失败）
/**
* 计时 尝试连接oracle的时间，（超过10分钟判断失败）
*
* @author chen
*
*
*/
public class OracleStatusService {
private static Map<String, Timer> alliveTask = new Hashtable<String, Timer>();
@ -41,8 +43,8 @@ public class OracleStatusService {
public void cancelToOracle(String replicasName, String operate) {
if (operate.equals("stop")) {
String cmd = "kubectl label --overwrite rc " + replicasName
+ " status=0";
String cmd = "kubectl --server " + Configs.KUBE_MASTER_ADDRESS
+ " label --overwrite rc " + replicasName + " status=0";
List<String> rList = Constant.ganymedSSH
.execCmdWaitAcquiescent(cmd);
StringBuffer sb = new StringBuffer();
@ -120,8 +122,8 @@ public class OracleStatusService {
killAlliveTask(taskName);
// client.updateOrAddReplicasLabelById(taskName, "status", "1");
// //更新ReplicationController标签，将oracle状态标示未1(0:启动中，1：失败，2：成功)
String cmd = "kubectl label --overwrite rc " + taskName
+ " status=1";
String cmd = "kubectl --server " + Configs.KUBE_MASTER_ADDRESS
+ " label --overwrite rc " + taskName + " status=1";
List<String> rList = Constant.ganymedSSH
.execCmdWaitAcquiescent(cmd);
StringBuffer sb = new StringBuffer();
@ -144,8 +146,10 @@ public class OracleStatusService {
+ ocp.getPassword());
String message = "失败";
if (flag && alliveTask.containsKey(taskName)) {
String cmd = "kubectl label --overwrite rc "
+ taskName + " status=2";
String cmd = "kubectl --server "
+ Configs.KUBE_MASTER_ADDRESS
+ " label --overwrite rc " + taskName
+ " status=2";
// client.updateOrAddReplicasLabelById(taskNSyame,
// "status", "2");
List<String> rList = Constant.ganymedSSH

335
src/com/platform/service/impl/OracleExtractServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

222
src/com/platform/service/thread/ThreadCheckoutStandardOracle.java
View File

File diff suppressed because it is too large Load Diff

2
src/com/platform/utils/Configs.java
Unescape View File

@ -27,6 +27,8 @@ public class Configs {
public static String KUBE_MASTER_URL = "http://192.168.0.110:8080/"; // kubernetes集群的maser
// URl
public static String KUBE_MASTER_ADDRESS="127.0.0.1:8080";
public static int ORACLE_DEFAULT_PORT = 1521; // oracle的默认端口号

2
src/com/platform/utils/ConfigsLoader.java
Unescape View File

@ -78,6 +78,8 @@ public class ConfigsLoader implements ServletContextListener {
Configs.GATHER_TABLESPACE_PATH = properties
.getProperty("gather-tablespace-path");
Configs.KUBE_MASTER_ADDRESS= properties.getProperty("kubeMasterAddress");
Configs.GATHER_TABLE_PASSWORD=properties.getProperty("gather-table-user-password");
Configs.FILE_UPLOAD_PATH = properties.getProperty("file_upload_path");

Write Preview
Loading…
Cancel
Save