xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #2632 from taosdata/jdbcfixes 

Fix build failure
This commit is contained in:
Shengliang Guan 2020-07-10 18:03:04 +08:00 committed by GitHub
parent 3dab079f5a 867bc9cc96
commit bcf7c23d08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TDNode.java
View File

@ -77,7 +77,7 @@ public class TDNode {
e.printStackTrace(); e.printStackTrace();
} }
if(binPath.equals("")) { if(binPath.isEmpty()) {
System.out.println("taosd not found"); System.out.println("taosd not found");
return; return;
} else { } else {
@ -106,14 +106,10 @@ public class TDNode {
String toBeKilled = "taosd"; String toBeKilled = "taosd";
if (this.running != 0) { if (this.running != 0) {
String psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print " + toBeKilled + "}'"; String killCmd = "pkill -kill -x " + toBeKilled;
try { String[] killCmds = {"sh", "-c", killCmd};
Process ps = Runtime.getRuntime().exec(psCmd); try {
ps.waitFor(); Runtime.getRuntime().exec(killCmds).waitFor();
long pid = ps.pid();
String killCmd = "kill -9 " + pid;
Runtime.getRuntime().exec(killCmd).waitFor();
for(int port = 6030; port < 6041; port ++) { for(int port = 6030; port < 6041; port ++) {
String fuserCmd = "fuser -k -n tcp " + port; String fuserCmd = "fuser -k -n tcp " + port;
@ -124,7 +120,7 @@ public class TDNode {
} }
this.running = 0; this.running = 0;
System.out.println("dnode:" + this.index + "is stopped by kill -9"); System.out.println("dnode:" + this.index + " is stopped by pkill");
} }
} }
@ -137,7 +133,6 @@ public class TDNode {
} }
} }
public void stopIP() { public void stopIP() {
try{ try{
String cmd = "sudo ifconfig lo:" + index + "192.168.0." + index + " down"; String cmd = "sudo ifconfig lo:" + index + "192.168.0." + index + " down";

8
src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TDNodes.java
View File

@ -16,11 +16,9 @@ public class TDNodes {
public void setPath(String path) { public void setPath(String path) {
try { try {
String psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'" ; String killCmd = "pkill -kill -x taosd";
Process ps = Runtime.getRuntime().exec(psCmd); String[] killCmds = {"sh", "-c", killCmd};
ps.waitFor(); Runtime.getRuntime().exec(killCmds).waitFor();
String killCmd = "kill -9 " + ps.pid();
Runtime.getRuntime().exec(killCmd).waitFor();
String binPath = System.getProperty("user.dir"); String binPath = System.getProperty("user.dir");
binPath += "/../../../debug"; binPath += "/../../../debug";