3.0.0

emc-mongoose · Dec 25, 2016 · 6a308ba · 6a308ba
1 parent 5c3d2c8
commit 6a308ba
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/config/logging.json b/config/logging.json
@@ -368,7 +368,7 @@
 						]
 					}
 				},
-				{
+				/*{
 					"name" : "extResultsFile",
 					"type": "file",
 					"fileName": "result.xml",
@@ -395,7 +395,7 @@
 							}
 						]
 					}
-				},
+				},*/
 				{
 					"name": "async",
 					"type": "Async",

diff --git a/load/monitor/src/main/java/com/emc/mongoose/load/monitor/MetricsSvcTask.java b/load/monitor/src/main/java/com/emc/mongoose/load/monitor/MetricsSvcTask.java
@@ -50,8 +50,10 @@ public MetricsSvcTask(
 	@Override
 
 	public final void run() {
+		final Thread currThread = Thread.currentThread();
+		currThread.setName(jobName);
 		long nextNanoTimeStamp;
-		while(true) {
+		while(!currThread.isInterrupted()) {
 			refreshStats();
 			nextNanoTimeStamp = System.nanoTime();
 			if(nextNanoTimeStamp - prevNanoTimeStamp > metricsPeriodNanoSec) {

diff --git a/.../monitor/src/main/java/com/emc/mongoose/load/monitor/metrics/MetricsStdoutLogMessage.java b/.../monitor/src/main/java/com/emc/mongoose/load/monitor/metrics/MetricsStdoutLogMessage.java
@@ -58,7 +58,7 @@ private static void formatSingleSnapshot(
 		final IoStats.Snapshot snapshot, final int concurrency, final int driversCount
 	) {
 		buffer
-			.append(runId).append("\n\t")
+			.append("\n\t")
 			.append(IoType.values()[ioTypeCode]).append('-')
 			.append(concurrency).append('x').append(driversCount)
 			.append(": n=(").append(snapshot.getSuccCount()).append('/')
@@ -79,7 +79,7 @@ private static void formatSingleSnapshot(
 	}
 
 	private void formatMultiSnapshot(final StringBuilder buffer) {
-		final StrBuilder strb = new StrBuilder(jobName).append(" metrics:");
+		final StrBuilder strb = new StrBuilder("metrics:");
 		if(snapshots.size() > 0) {
 			strb.appendNewLine();
 			for(final String tableHeaderLine : TABLE_HEADER_LINES) {

diff --git a/run/src/main/java/com/emc/mongoose/run/scenario/LoadJob.java b/run/src/main/java/com/emc/mongoose/run/scenario/LoadJob.java
@@ -75,6 +75,7 @@ public final void run() {
 
 		final LoadConfig loadConfig = localConfig.getLoadConfig();
 		final String jobName = loadConfig.getJobConfig().getName();
+		LOG.info(Markers.MSG, "Run the load job \"{}\"", jobName);
 		loadConfig.getMetricsConfig().setPrecondition(preconditionFlag);
 
 		final ItemConfig itemConfig = localConfig.getItemConfig();
@@ -209,16 +210,16 @@ public final void run() {
 			}
 			monitor.start();
 			if(monitor.await(timeLimitSec, TimeUnit.SECONDS)) {
-				LOG.info(Markers.MSG, "Load monitor done");
+				LOG.info(Markers.MSG, "Load job \"{}\" done", jobName);
 			} else {
-				LOG.info(Markers.MSG, "Load monitor timeout");
+				LOG.info(Markers.MSG, "Load job \"{}\" timeout", jobName);
 			}
 		} catch(final RemoteException e) {
 			LogUtil.exception(LOG, Level.ERROR, e, "Unexpected failure");
 		} catch(final IOException e) {
 			LogUtil.exception(LOG, Level.WARN, e, "Failed to open the item output file");
 		} catch(final InterruptedException e) {
-			LOG.debug(Markers.MSG, "Load monitor interrupted");
+			LOG.debug(Markers.MSG, "Load job \"{}\" interrupted", jobName);
 		}
 	}
 

diff --git a/run/src/main/java/com/emc/mongoose/run/scenario/MixedLoadJob.java b/run/src/main/java/com/emc/mongoose/run/scenario/MixedLoadJob.java
@@ -84,6 +84,7 @@ public final void run() {
 
 		final LoadConfig localLoadConfig = localConfig.getLoadConfig();
 		final String jobName = localLoadConfig.getJobConfig().getName();
+		LOG.info(Markers.MSG, "Run the mixed load job \"{}\"", jobName);
 		final LimitConfig limitConfig = localLoadConfig.getLimitConfig();
 
 		final long t = limitConfig.getTime();