Skip to content

Commit 453bb57

Browse files
authored
Disable creating StorPool logs when there isn't StorPool primary storage (#6317)
There is not need to create log files for StorPool driver when there isn't a StorPool primary storage
1 parent f8920b9 commit 453bb57

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/collector/StorPoolAbandonObjectsCollector.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,13 @@ public boolean start() {
8989
}
9090

9191
private void init() {
92+
List<StoragePoolVO> spPools = storagePoolDao.findPoolsByProvider(StorPoolUtil.SP_PROVIDER_NAME);
93+
if (CollectionUtils.isNotEmpty(spPools)) {
94+
StorPoolHelper.appendLogger(log, ABANDON_LOG, "abandon");
95+
}
9296
_volumeTagsUpdateExecutor = Executors.newScheduledThreadPool(2,
9397
new NamedThreadFactory("StorPoolAbandonObjectsCollector"));
94-
StorPoolHelper.appendLogger(log, ABANDON_LOG, "abandon");
98+
9599
if (volumeCheckupTagsInterval.value() > 0) {
96100
_volumeTagsUpdateExecutor.scheduleAtFixedRate(new StorPoolVolumesTagsUpdate(),
97101
volumeCheckupTagsInterval.value(), volumeCheckupTagsInterval.value(), TimeUnit.SECONDS);

plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@ private String getVcPolicyTag(Long vmId) {
898898
}
899899

900900
public void handleQualityOfServiceForVolumeMigration(VolumeInfo arg0, QualityOfServiceState arg1) {
901-
StorPoolUtil.spLog("handleQualityOfServiceForVolumeMigration with volume name=%s", arg0.getName());
901+
log.debug(String.format("handleQualityOfServiceForVolumeMigration with volume name=%s is not supported", arg0.getName()));
902902
}
903903

904904

plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ public SnapshotInfo backupSnapshot(SnapshotInfo snapshotInfo) {
8181
snapshotObj.processEvent(Snapshot.Event.BackupToSecondary);
8282
snapshotObj.processEvent(Snapshot.Event.OperationSucceeded);
8383
} catch (NoTransitionException ex) {
84-
StorPoolUtil.spLog("Failed to change state: " + ex.toString());
84+
log.debug("Failed to change state: " + ex.toString());
8585
try {
8686
snapshotObj.processEvent(Snapshot.Event.OperationFailed);
8787
} catch (NoTransitionException ex2) {
88-
StorPoolUtil.spLog("Failed to change state: " + ex2.toString());
88+
log.debug("Failed to change state: " + ex2.toString());
8989
}
9090
}
9191
return snapshotInfo;
@@ -126,7 +126,7 @@ public boolean deleteSnapshot(Long snapshotId) {
126126

127127
@Override
128128
public StrategyPriority canHandle(Snapshot snapshot, SnapshotOperation op) {
129-
StorPoolUtil.spLog("StorpoolSnapshotStrategy.canHandle: snapshot=%s, uuid=%s, op=%s", snapshot.getName(), snapshot.getUuid(), op);
129+
log.debug(String.format("StorpoolSnapshotStrategy.canHandle: snapshot=%s, uuid=%s, op=%s", snapshot.getName(), snapshot.getUuid(), op));
130130

131131
if (op != SnapshotOperation.DELETE) {
132132
return StrategyPriority.CANT_HANDLE;

0 commit comments

Comments
 (0)