apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable creating StorPool logs when there isn't StorPool primary storage (#6317)

Browse Source 
There is not need to create log files for StorPool driver when there
isn't a StorPool primary storage
This commit is contained in:
slavkap 2022-04-27 13:24:44 +03:00 committed by GitHub
parent f8920b9312
commit 453bb57fd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,9 +89,13 @@ public class StorPoolAbandonObjectsCollector extends ManagerBase implements Conf
} }
private void init() { private void init() {
List<StoragePoolVO> spPools = storagePoolDao.findPoolsByProvider(StorPoolUtil.SP_PROVIDER_NAME);
if (CollectionUtils.isNotEmpty(spPools)) {
StorPoolHelper.appendLogger(log, ABANDON_LOG, "abandon");
}
_volumeTagsUpdateExecutor = Executors.newScheduledThreadPool(2, _volumeTagsUpdateExecutor = Executors.newScheduledThreadPool(2,
new NamedThreadFactory("StorPoolAbandonObjectsCollector")); new NamedThreadFactory("StorPoolAbandonObjectsCollector"));
StorPoolHelper.appendLogger(log, ABANDON_LOG, "abandon");
if (volumeCheckupTagsInterval.value() > 0) { if (volumeCheckupTagsInterval.value() > 0) {
_volumeTagsUpdateExecutor.scheduleAtFixedRate(new StorPoolVolumesTagsUpdate(), _volumeTagsUpdateExecutor.scheduleAtFixedRate(new StorPoolVolumesTagsUpdate(),
volumeCheckupTagsInterval.value(), volumeCheckupTagsInterval.value(), TimeUnit.SECONDS); volumeCheckupTagsInterval.value(), volumeCheckupTagsInterval.value(), TimeUnit.SECONDS);

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

@ -898,7 +898,7 @@ public class StorPoolPrimaryDataStoreDriver implements PrimaryDataStoreDriver {
} }
public void handleQualityOfServiceForVolumeMigration(VolumeInfo arg0, QualityOfServiceState arg1) { public void handleQualityOfServiceForVolumeMigration(VolumeInfo arg0, QualityOfServiceState arg1) {
StorPoolUtil.spLog("handleQualityOfServiceForVolumeMigration with volume name=%s", arg0.getName()); log.debug(String.format("handleQualityOfServiceForVolumeMigration with volume name=%s is not supported", arg0.getName()));
} }

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

@ -81,11 +81,11 @@ public class StorPoolSnapshotStrategy implements SnapshotStrategy {
snapshotObj.processEvent(Snapshot.Event.BackupToSecondary); snapshotObj.processEvent(Snapshot.Event.BackupToSecondary);
snapshotObj.processEvent(Snapshot.Event.OperationSucceeded); snapshotObj.processEvent(Snapshot.Event.OperationSucceeded);
} catch (NoTransitionException ex) { } catch (NoTransitionException ex) {
StorPoolUtil.spLog("Failed to change state: " + ex.toString()); log.debug("Failed to change state: " + ex.toString());
try { try {
snapshotObj.processEvent(Snapshot.Event.OperationFailed); snapshotObj.processEvent(Snapshot.Event.OperationFailed);
} catch (NoTransitionException ex2) { } catch (NoTransitionException ex2) {
StorPoolUtil.spLog("Failed to change state: " + ex2.toString()); log.debug("Failed to change state: " + ex2.toString());
} }
} }
return snapshotInfo; return snapshotInfo;
@ -126,7 +126,7 @@ public class StorPoolSnapshotStrategy implements SnapshotStrategy {
@Override @Override
public StrategyPriority canHandle(Snapshot snapshot, SnapshotOperation op) { public StrategyPriority canHandle(Snapshot snapshot, SnapshotOperation op) {
StorPoolUtil.spLog("StorpoolSnapshotStrategy.canHandle: snapshot=%s, uuid=%s, op=%s", snapshot.getName(), snapshot.getUuid(), op); log.debug(String.format("StorpoolSnapshotStrategy.canHandle: snapshot=%s, uuid=%s, op=%s", snapshot.getName(), snapshot.getUuid(), op));
if (op != SnapshotOperation.DELETE) { if (op != SnapshotOperation.DELETE) {
return StrategyPriority.CANT_HANDLE; return StrategyPriority.CANT_HANDLE;