Add convenient delete methods in DataObject to delete dangling data

minchen07 · minchen07 · commit eb93efdaa4f0 · 2013-05-30T14:51:03.000-07:00
object.
diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataObject.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataObject.java
@@ -38,6 +38,8 @@ public interface DataObject {
     // public DiskFormat getFormat();
     public String getUuid();
 
+    boolean delete();
+
     public void processEvent(ObjectInDataStoreStateMachine.Event event);
 
     public void processEvent(ObjectInDataStoreStateMachine.Event event, Answer answer);
diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
@@ -125,12 +125,12 @@ public Long getSize() {
         }
 
         /*
-         * 
+         *
          * // If the template that was passed into this allocator is not
          * installed in the storage pool, // add 3 * (template size on secondary
          * storage) to the running total VMTemplateHostVO templateHostVO =
          * _storageMgr.findVmTemplateHost(templateForVmCreation.getId(), null);
-         * 
+         *
          * if (templateHostVO == null) { VMTemplateSwiftVO templateSwiftVO =
          * _swiftMgr.findByTmpltId(templateForVmCreation.getId()); if
          * (templateSwiftVO != null) { long templateSize =
@@ -395,4 +395,13 @@ public long getDomainId() {
         return this.imageVO.getDomainId();
     }
 
+    @Override
+    public boolean delete() {
+        if (dataStore != null) {
+            return dataStore.delete(this);
+        }
+        return true;
+    }
+
+
 }
diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
@@ -284,4 +284,11 @@ public void addPayload(Object data) {
 
     }
 
+    @Override
+    public boolean delete() {
+        if (store != null) {
+            return store.delete(this);
+        }
+        return true;
+    }
 }
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java
@@ -252,8 +252,9 @@ public DataObject create(DataObject obj) {
 
     @Override
     public boolean delete(DataObject obj) {
-        // TODO Auto-generated method stub
-        return false;
+        //TODO: clean up through driver
+        objectInStoreMgr.delete(obj);
+        return true;
     }
 
     @Override
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
@@ -505,4 +505,12 @@ public void processEventOnly(ObjectInDataStoreStateMachine.Event event, Answer a
     public ImageFormat getFormat() {
         return this.volumeVO.getFormat();
     }
+
+    @Override
+    public boolean delete() {
+        if (dataStore != null) {
+            return dataStore.delete(this);
+        }
+        return true;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -284,4 +284,11 @@ public void addPayload(Object data) {`
`284`	`284`
`285`	`285`	`}`
`286`	`286`
	`287`	`+ @Override`
	`288`	`+ public boolean delete() {`
	`289`	`+ if (store != null) {`
	`290`	`+ return store.delete(this);`
	`291`	`+ }`
	`292`	`+ return true;`
	`293`	`+ }`
`287`	`294`	`}`
Original file line number	Diff line number	Diff line change
`@@ -505,4 +505,12 @@ public void processEventOnly(ObjectInDataStoreStateMachine.Event event, Answer a`
`505`	`505`	`public ImageFormat getFormat() {`
`506`	`506`	`return this.volumeVO.getFormat();`
`507`	`507`	`}`
	`508`	`+`
	`509`	`+ @Override`
	`510`	`+ public boolean delete() {`
	`511`	`+ if (dataStore != null) {`
	`512`	`+ return dataStore.delete(this);`
	`513`	`+ }`
	`514`	`+ return true;`
	`515`	`+ }`
`508`	`516`	`}`