Fixed a merge issue in ImageStoreUploadMonitorImpl

abh1sar · abh1sar · commit f7f0e7512254 · 2026-03-13T15:19:28.000+05:30
diff --git a/server/src/main/java/com/cloud/storage/ImageStoreUploadMonitorImpl.java b/server/src/main/java/com/cloud/storage/ImageStoreUploadMonitorImpl.java
@@ -544,7 +544,6 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
                                 }
                             }
                             stateMachine.transitTo(tmpTemplate, VirtualMachineTemplate.Event.OperationSucceeded, null, _templateDao);
-                            _resourceLimitMgr.incrementResourceCount(template.getAccountId(), Resource.ResourceType.secondary_storage, answer.getVirtualSize());
                             //publish usage event
                             String etype = EventTypes.EVENT_TEMPLATE_CREATE;
                             if (tmpTemplate.getFormat() == Storage.ImageFormat.ISO) {

Original file line number	Diff line number	Diff line change
`@@ -544,7 +544,6 @@ public void doInTransactionWithoutResult(TransactionStatus status) {`
`544`	`544`	`}`
`545`	`545`	`}`
`546`	`546`	`stateMachine.transitTo(tmpTemplate, VirtualMachineTemplate.Event.OperationSucceeded, null, _templateDao);`
`547`		`- _resourceLimitMgr.incrementResourceCount(template.getAccountId(), Resource.ResourceType.secondary_storage, answer.getVirtualSize());`
`548`	`547`	`//publish usage event`
`549`	`548`	`String etype = EventTypes.EVENT_TEMPLATE_CREATE;`
`550`	`549`	`if (tmpTemplate.getFormat() == Storage.ImageFormat.ISO) {`