intel-cloud#140 sometimes duplicate workloadId in run-history

Cxquan · Jan 10, 2014 · 0d9b310 · 0d9b310
1 parent 2dcb0c9
commit 0d9b310
Showing 1 changed file with 26 additions and 17 deletions.
diff --git a/...osbench-controller/src/com/intel/cosbench/controller/archiver/SimpleWorkloadArchiver.java b/...osbench-controller/src/com/intel/cosbench/controller/archiver/SimpleWorkloadArchiver.java
@@ -69,13 +69,12 @@ public synchronized void archive(WorkloadInfo info) {
         } catch (Exception e) {
             LOGGER.error("fail to archive workload", e);
             return;
-        } finally {
-            try {
-                updateCount();
-            } catch (Exception e) {
-                LOGGER.error("cannot update workload count", e);
-            }
         }
+        try {
+			updateCount(info);
+		} catch (Exception e) {
+			LOGGER.error("fail to update count", e);
+		}
         String id = info.getId();
         LOGGER.info("workload {} has been successfully archived", id);
     }
@@ -240,21 +239,21 @@ private void exportPerformanceMatrix(WorkloadInfo info) throws IOException {
         String msg = "perf details of workload {} has been added to {}";
         LOGGER.debug(msg, id, path);
     }
-
-    private void updateCount() throws IOException {
+ 
+    private void updateCount(WorkloadInfo info) throws IOException {
         int count = 0;
         File file = new File(ARCHIVE_DIR, ".meta");
-        if (file.exists() && file.length() > 0) {
-            Reader reader = new BufferedReader(new FileReader(file));
-            try {
-                count = new Scanner(reader).nextInt();
-            } finally {
-                reader.close();
-            }
-        }
+        String workloadId = null;
+        workloadId = info.getId();
+        try {
+    		count = parseID(workloadId);			
+		} catch (Exception e) {
+			LOGGER.error("cannot parse workloadId", e);
+		}
+
         Writer writer = new BufferedWriter(new FileWriter(file));
         try {
-            writer.write(String.valueOf(++count));
+            writer.write(String.valueOf(count));
         } finally {
             writer.close();
         }
@@ -286,5 +285,15 @@ private int retrieveCount() throws IOException {
         LOGGER.debug("workload count has been retrieved as {}", count);
         return count;
     }
+
+	private int parseID(String workloadID) throws NumberFormatException, IndexOutOfBoundsException {
+		int count = 0;
+		try {
+			count = Integer.parseInt(workloadID.substring(1)); 
+		} catch (Exception e) {
+			LOGGER.error("cannot extract count from workloadId", e);
+		}
+		return count;
+	}
 
 }