Skip to content

Commit 06b5e84

Browse files
Removed redundant parsing of VMSnapshot usage record. (apache#5872)
1 parent 68a5e5a commit 06b5e84

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

usage/src/main/java/com/cloud/usage/UsageManagerImpl.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
import com.cloud.usage.parser.StorageUsageParser;
7676
import com.cloud.usage.parser.BackupUsageParser;
7777
import com.cloud.usage.parser.VMInstanceUsageParser;
78-
import com.cloud.usage.parser.VMSanpshotOnPrimaryParser;
78+
import com.cloud.usage.parser.VMSnapshotOnPrimaryParser;
7979
import com.cloud.usage.parser.VMSnapshotUsageParser;
8080
import com.cloud.usage.parser.VPNUserUsageParser;
8181
import com.cloud.usage.parser.VmDiskUsageParser;
@@ -958,13 +958,7 @@ private boolean parseHelperTables(AccountVO account, Date currentStartDate, Date
958958
s_logger.debug("VM Snapshot usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
959959
}
960960
}
961-
parsed = VMSnapshotUsageParser.parse(account, currentStartDate, currentEndDate);
962-
if (s_logger.isDebugEnabled()) {
963-
if (!parsed) {
964-
s_logger.debug("VM Snapshot usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
965-
}
966-
}
967-
parsed = VMSanpshotOnPrimaryParser.parse(account, currentStartDate, currentEndDate);
961+
parsed = VMSnapshotOnPrimaryParser.parse(account, currentStartDate, currentEndDate);
968962
if (s_logger.isDebugEnabled()) {
969963
if (!parsed) {
970964
s_logger.debug("VM Snapshot on primary usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");

usage/src/main/java/com/cloud/usage/parser/VMSanpshotOnPrimaryParser.java renamed to usage/src/main/java/com/cloud/usage/parser/VMSnapshotOnPrimaryParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
4040

4141
@Component
42-
public class VMSanpshotOnPrimaryParser {
43-
public static final Logger s_logger = Logger.getLogger(VMSanpshotOnPrimaryParser.class.getName());
42+
public class VMSnapshotOnPrimaryParser {
43+
public static final Logger s_logger = Logger.getLogger(VMSnapshotOnPrimaryParser.class.getName());
4444

4545
private static UsageDao s_usageDao;
4646
private static UsageVMSnapshotOnPrimaryDao s_usageSnapshotOnPrimaryDao;

0 commit comments

Comments
 (0)