Fix issue intel-cloud#222: completed operation count is mismatching w…

…ith configured totalOps Signed-off-by: ywang19 <[email protected]>
ddebby · Dec 15, 2014 · 3a84f33 · 3a84f33
1 parent 0e71eba
commit 3a84f33
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 0 deletions.
diff --git a/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/Cleaner.java b/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/Cleaner.java
@@ -101,6 +101,7 @@ public static void doDispose(String conName, Config config, Session session) {
         try {
             session.getApi().deleteContainer(conName, config);
         } catch (StorageInterruptedException sie) {
+            doLogErr(session.getLogger(), sie.getMessage(), sie);
             throw new AbortedException();
         } catch (StorageException se) {
             String msg = "Error deleting container " +  conName; 

diff --git a/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/Deleter.java b/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/Deleter.java
@@ -74,6 +74,7 @@ public static Sample doDelete(String conName, String objName,
         try {
             session.getApi().deleteObject(conName, objName, config);
         } catch (StorageInterruptedException sie) {
+            doLogErr(session.getLogger(), sie.getMessage(), sie);
             throw new AbortedException();
         } catch (StorageException se) {
             String msg = "Error deleting object " +  conName + ": " + objName; 

diff --git a/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/FileWriter.java b/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/FileWriter.java
@@ -142,6 +142,7 @@ public Sample doWrite(InputStream in, long length, String conName, String objNam
         try {
               session.getApi().createObject(conName, objName, cin, length, config);
         } catch (StorageInterruptedException sie) {
+            doLogErr(session.getLogger(), sie.getMessage(), sie);
             throw new AbortedException();
         } catch (Exception e) {
         	isUnauthorizedException(e, session);

diff --git a/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/Lister.java b/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/Lister.java
@@ -84,6 +84,7 @@ private Sample doList(OutputStream out, String conName, String objName,
 	        copyLarge(in, cout);
 	        xferTime = System.currentTimeMillis() - xferStart;
         } catch (StorageInterruptedException sie) {
+            doLogErr(session.getLogger(), sie.getMessage(), sie);
             throw new AbortedException();
         } catch (Exception e) {
         	isUnauthorizedException(e, session);

diff --git a/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/Preparer.java b/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/Preparer.java
@@ -112,6 +112,7 @@ public static void doInit(String conName, Config config, Session session) {
         try {
         	session.getApi().createContainer(conName, config);
         } catch (StorageInterruptedException sie) {
+            doLogErr(session.getLogger(), sie.getMessage(), sie);
             throw new AbortedException();
         }catch(StorageException se) {
         	isUnauthorizedException(se, session);

diff --git a/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/Reader.java b/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/Reader.java
@@ -96,6 +96,7 @@ private Sample doRead(OutputStream out, String conName, String objName,
 				return new Sample(new Date(), getId(), getOpType(),
 						getSampleType(), getName(), false);
         } catch (StorageInterruptedException sie) {
+            doLogErr(session.getLogger(), sie.getMessage(), sie);
             throw new AbortedException();
         } catch (Exception e) {
         	isUnauthorizedException(e, session);

diff --git a/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/Writer.java b/dev/cosbench-driver/src/com/intel/cosbench/driver/operator/Writer.java
@@ -97,6 +97,7 @@ public static  Sample doWrite(InputStream in, long length, String conName,
             session.getApi()
                     .createObject(conName, objName, cin, length, config);
         } catch (StorageInterruptedException sie) {
+            doLogErr(session.getLogger(), sie.getMessage(), sie);
             throw new AbortedException();
         } catch (Exception e) {
         	isUnauthorizedException(e, session);