IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

docker-metrics directory fixes and adding back integration test

Browse Source
This commit is contained in:
phact
2020-03-25 14:51:45 -04:00
parent 0107f5eb42
commit f8bbb4c20f
2 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsHelper.java
View File

@@ -184,22 +184,17 @@ public class DockerMetricsHelper {
datasource = datasource.replace("!!!GRAPHITE_IP!!!", ip);
File prometheusDir = new File(userHome, ".nosqlbench/prometheus");
if(!prometheusDir.mkdir()){
if(prometheusDir.canWrite()){
System.out.println("no write access");
}
if(prometheusDir.canRead()){
System.out.println("no read access");
}
System.out.println("Could not create directory "+ userHome + "./nosqlbench/prometheus");
System.out.println("fix directory permissions to run --docker-metrics");
System.exit(1);
}
File nosqlbenchDir = new File(userHome, "/.nosqlbench/");
mkdir(nosqlbenchDir);
new File(userHome, ".nosqlbench/prometheus-conf").mkdir();
Path prometheusDirPath = Paths.get(userHome, ".nosqlbench" +
File prometheusDir = new File(userHome, "/.nosqlbench/prometheus");
mkdir(prometheusDir);
File promConfDir = new File(userHome, "/.nosqlbench/prometheus-conf");
mkdir(promConfDir);
Path prometheusDirPath = Paths.get(userHome, "/.nosqlbench" +
"/prometheus");
Set<PosixFilePermission> perms = new HashSet<>();
@@ -211,7 +206,7 @@ public class DockerMetricsHelper {
Files.setPosixFilePermissions(prometheusDirPath, perms);
} catch (IOException e) {
logger.error("failed to set permissions on prom backup " +
"directory (~/.nosqlbench/prometheus)");
"directory " + userHome + "/.nosqlbench/prometheus)");
e.printStackTrace();
System.exit(1);
}
@@ -231,13 +226,30 @@ public class DockerMetricsHelper {
}
}
private void mkdir(File dir) {
if(dir.exists()){
return;
}
if(! dir.mkdir()){
if( dir.canWrite()){
System.out.println("no write access");
}
if( dir.canRead()){
System.out.println("no read access");
}
System.out.println("Could not create directory "+ userHome + "/.nosqlbench/prometheus");
System.out.println("fix directory permissions to run --docker-metrics");
System.exit(1);
}
}
private void setupGrafanaFiles(String ip) {
File grafanaDir = new File(userHome, ".nosqlbench/grafana");
grafanaDir.mkdir();
File grafanaDir = new File(userHome, "/.nosqlbench/grafana");
mkdir(grafanaDir);
Path grafanaDirPath = Paths.get(userHome, ".nosqlbench/grafana");
Path grafanaDirPath = Paths.get(userHome, "/.nosqlbench/grafana");
Set<PosixFilePermission> perms = new HashSet<>();
@@ -248,8 +260,8 @@ public class DockerMetricsHelper {
try {
Files.setPosixFilePermissions(grafanaDirPath, perms);
} catch (IOException e) {
logger.error("failed to set permissions on prom backup " +
"directory (~/.nosqlbench/prometheus)");
logger.error("failed to set permissions on grafana directory " +
"directory " + userHome + "/.nosqlbench/grafana)");
e.printStackTrace();
System.exit(1);
}

50
nb/src/test/java/io/nosqlbench/engine/core/script/NBCliIntegrationTests.java
View File

@@ -42,29 +42,29 @@ public class NBCliIntegrationTests {
assertThat(result.exitStatus).isEqualTo(0);
}
// disabled till after release
// @Test
// public void dockerMetrics() {
// ProcessInvoker invoker = new ProcessInvoker();
// invoker.setLogDir("logs/test");
//
// // check for docker
// ProcessResult result = invoker.run("docker-detection-test", 15,
// "docker", "ps"
// );
//
// System.out.println(result.getStdoutData());
// System.out.println(result.getStderrData());
//
// if(result.exitStatus ==0) {
// result = invoker.run("docker-metrics-test", 15,
// "java", "-jar", JARNAME, "--logs-dir", "logs/test", "--docker-metrics"
// );
// System.out.println(result.getStdoutData());
// System.out.println(result.getStderrData());
// assertThat(result.exitStatus).isEqualTo(0);
// return;
// }
//
// logger.warn("skipped docker-metrics test because docker is not available");
// }
@Test
public void dockerMetrics() {
ProcessInvoker invoker = new ProcessInvoker();
invoker.setLogDir("logs/test");
// check for docker
ProcessResult result = invoker.run("docker-detection-test", 15,
"docker", "ps"
);
System.out.println(result.getStdoutData());
System.out.println(result.getStderrData());
if(result.exitStatus ==0) {
result = invoker.run("docker-metrics-test", 15,
"java", "-jar", JARNAME, "--logs-dir", "logs/test", "--docker-metrics"
);
System.out.println(result.getStdoutData());
System.out.println(result.getStderrData());
assertThat(result.exitStatus).isEqualTo(0);
return;
}
logger.warn("skipped docker-metrics test because docker is not available");
}
}