Copy over #2444

palantir · Oct 11, 2017 · 4c72cd7 · 4c72cd7
1 parent 7288b63
commit 4c72cd7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java
@@ -148,9 +148,13 @@ private long grabLocksAndRun(SweepLocks locks) throws InterruptedException {
                 log.info("The table being swept by the background sweeper was dropped, moving on...");
             } else {
                 SweepBatchConfig lastBatchConfig = getAdjustedBatchConfig();
-                log.warn("The background sweep job failed unexpectedly with batch config {}."
+                log.warn("The background sweep job failed unexpectedly with candidate batch size {},"
+                                + " delete batch size {},"
+                                + " and {} cell+timestamp pairs to examine."
                                 + " Attempting to continue with a lower batch size...",
-                        SafeArg.of("cell batch size", lastBatchConfig),
+                        SafeArg.of("candidateBatchSize", lastBatchConfig.candidateBatchSize()),
+                        SafeArg.of("deleteBatchSize", lastBatchConfig.deleteBatchSize()),
+                        SafeArg.of("maxCellTsPairsToExamine", lastBatchConfig.maxCellTsPairsToExamine()),
                         e);
                 // Cut batch size in half, always sweep at least one row (we round down).
                 batchSizeMultiplier = Math.max(batchSizeMultiplier / 2, 1.5 / lastBatchConfig.candidateBatchSize());

diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SpecificTableSweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SpecificTableSweeper.java
@@ -161,10 +161,14 @@ void runOnceForTable(TableToSweep tableToSweep,
             // This error may be logged on some paths above, but I prefer to log defensively.
             log.info("Failed to sweep table {}"
                             + " at row {}"
-                            + " with batch config {}.",
+                            + " with candidate batch size {},"
+                            + " delete batch size {},"
+                            + " and {} cell+timestamp pairs to examine.",
                     LoggingArgs.tableRef("tableRef", tableRef),
                     UnsafeArg.of("startRow", startRowToHex(startRow)),
-                    SafeArg.of("batchConfig", batchConfig),
+                    SafeArg.of("candidateBatchSize", batchConfig.candidateBatchSize()),
+                    SafeArg.of("deleteBatchSize", batchConfig.deleteBatchSize()),
+                    SafeArg.of("maxCellTsPairsToExamine", batchConfig.maxCellTsPairsToExamine()),
                     e);
             throw e;
         }

diff --git a/docs/source/release_notes/release-notes.rst b/docs/source/release_notes/release-notes.rst
@@ -107,6 +107,11 @@ develop
           We now throw the actual cause for the invocation exception.
           (`Pull Request <https://github.com/palantir/atlasdb/pull/2460>`__)
 
+    *    - |fixed|
+         - Sweep candidate batches are now logged correctly.
+           Previously, we would log a ``SafeArg`` for these batches that had no content.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/2475>`__)
+
 .. <<<<------------------------------------------------------------------------------------------------------------->>>>
 
 =======