>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21336?usp=email )
Change subject: [NO ISSUE][*DB][STO] Reduce logging spam on local storage cleanup ...................................................................... [NO ISSUE][*DB][STO] Reduce logging spam on local storage cleanup Consolidate logging for LocalStorageCleanupTask, replacing 2*partitions log entries with two. Change-Id: I47b93a79759d0457fd520c4e813fea80dc0e60fb Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21336 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Integration-Tests: Jenkins <[email protected]> --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/StorageCleanupRequestMessage.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/LocalStorageCleanupTask.java M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java 3 files changed, 12 insertions(+), 8 deletions(-) Approvals: Jenkins: Verified; Verified Michael Blow: Looks good to me, but someone else must approve Hussain Towaileb: Looks good to me, approved diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/StorageCleanupRequestMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/StorageCleanupRequestMessage.java index 799510c..cc9fa1d 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/StorageCleanupRequestMessage.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/StorageCleanupRequestMessage.java @@ -70,9 +70,7 @@ deleteInvalidIndex(appContext, localResourceRepository, resource); } } - for (Integer partition : nodePartitions) { - localResourceRepository.cleanup(partition); - } + localResourceRepository.cleanup(nodePartitions); try { broker.sendMessageToPrimaryCC(new VoidResponse(reqId, null)); } catch (Exception e) { diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/LocalStorageCleanupTask.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/LocalStorageCleanupTask.java index 673e401..e9ce1ce 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/LocalStorageCleanupTask.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/LocalStorageCleanupTask.java @@ -49,9 +49,7 @@ if (appCtx.isCloudDeployment() && nodePartitions.contains(metadataPartitionId)) { appCtx.getTransactionSubsystem().getTransactionManager().rollbackMetadataTransactionsWithoutWAL(); } - for (Integer partition : nodePartitions) { - localResourceRepository.cleanup(partition); - } + localResourceRepository.cleanup(nodePartitions); } private void deleteInvalidMetadataIndexes(PersistentLocalResourceRepository localResourceRepository) diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java index d53c258..bfce93c 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java @@ -560,11 +560,19 @@ } } + public void cleanup(Partitions partitions) throws HyracksDataException { + LOGGER.info("Cleaning up indexes in partitions {}", partitions); + for (int partition : partitions) { + cleanup(partition); + } + LOGGER.info("Finished cleaning up indexes in partitions {} successfully", partitions); + } + public void cleanup(int partition) throws HyracksDataException { - LOGGER.info("Cleaning up indexes in partition {}", partition); + LOGGER.debug("Cleaning up indexes in partition {}", partition); CleanupBlockingIOOperation cleanupOp = new CleanupBlockingIOOperation(partition, this, ioManager); datasetLifecycleManager.waitForIOAndPerform(AllDatasetsReplicationStrategy.INSTANCE, partition, cleanupOp); - LOGGER.info("Finished cleaning up indexes in partition {} successfully", partition); + LOGGER.debug("Finished cleaning up indexes in partition {} successfully", partition); } /** -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21336?usp=email To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I47b93a79759d0457fd520c4e813fea80dc0e60fb Gerrit-Change-Number: 21336 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Ali Alsuliman <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]>
