Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nvazquez merged 1 commit into from
Apr 27, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...rc/main/java/org/apache/cloudstack/storage/collector/StorPoolAbandonObjectsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,13 @@ public boolean start() {
}

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,
new NamedThreadFactory("StorPoolAbandonObjectsCollector"));
StorPoolHelper.appendLogger(log, ABANDON_LOG, "abandon");

if (volumeCheckupTagsInterval.value() > 0) {
_volumeTagsUpdateExecutor.scheduleAtFixedRate(new StorPoolVolumesTagsUpdate(),
volumeCheckupTagsInterval.value(), volumeCheckupTagsInterval.value(), TimeUnit.SECONDS);
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ private String getVcPolicyTag(Long vmId) {
}

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()));
}


Expand Down
6 changes: 3 additions & 3 deletions ...orpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ public SnapshotInfo backupSnapshot(SnapshotInfo snapshotInfo) {
snapshotObj.processEvent(Snapshot.Event.BackupToSecondary);
snapshotObj.processEvent(Snapshot.Event.OperationSucceeded);
} catch (NoTransitionException ex) {
StorPoolUtil.spLog("Failed to change state: " + ex.toString());
log.debug("Failed to change state: " + ex.toString());
try {
snapshotObj.processEvent(Snapshot.Event.OperationFailed);
} catch (NoTransitionException ex2) {
StorPoolUtil.spLog("Failed to change state: " + ex2.toString());
log.debug("Failed to change state: " + ex2.toString());
}
}
return snapshotInfo;
Expand Down Expand Up @@ -126,7 +126,7 @@ public boolean deleteSnapshot(Long snapshotId) {

@Override
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) {
return StrategyPriority.CANT_HANDLE;
Expand Down