Skip to content

Commit 3929a0b

Browse files
Apply suggestions from code review - add ids to descriptions
Co-authored-by: Keith Turner <kturner@apache.org>
1 parent 891afe2 commit 3929a0b

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private TabletMetadata commitCompaction(ServerContext ctx, ExternalCompactionId
130130

131131
tabletMutator.submit(
132132
tabletMetadata -> !tabletMetadata.getExternalCompactions().containsKey(ecid),
133-
() -> "commit compaction");
133+
() -> "commit compaction "+ecid);
134134

135135
if (LOG.isDebugEnabled()) {
136136
LOG.debug("Compaction completed {} added {} removed {}", tablet.getExtent(), newDatafile,

server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ private static void removeBulkLoadEntries(Ample ample, TableId tableId, FateId f
111111
tabletsMutator.mutateTablet(tablet.getExtent()).requireAbsentOperation();
112112
tablet.getLoaded().entrySet().stream().filter(entry -> entry.getValue().equals(fateId))
113113
.map(Map.Entry::getKey).forEach(tabletMutator::deleteBulkFile);
114-
tabletMutator.submit(tm -> false, () -> "remove bulk load entries");
114+
tabletMutator.submit(tm -> false, () -> "remove bulk load entries "+fateId);
115115
}
116116
}
117117

server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ void load(List<TabletMetadata> tablets, Files files) {
251251
Preconditions.checkState(
252252
loadingFiles.put(tablet.getExtent(), List.copyOf(filesToLoad.keySet())) == null);
253253

254-
tabletMutator.submit(tm -> false, () -> "bulk load files");
254+
tabletMutator.submit(tm -> false, () -> "bulk load files "+fateId);
255255
}
256256
}
257257

server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/ReserveTablets.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public long isReady(FateId fateId, Manager manager) throws Exception {
9696
// must wait for the tablet to have no location before proceeding to actually delete. See
9797
// the documentation about the opid column in the MetadataSchema class for more details.
9898
conditionalMutator.mutateTablet(tabletMeta.getExtent()).requireAbsentOperation()
99-
.putOperation(opid).submit(tm -> opid.equals(tm.getOperationId()), () -> "put opid");
99+
.putOperation(opid).submit(tm -> opid.equals(tm.getOperationId()), () -> "put opid "+opid);
100100
submitted++;
101101
}
102102
}

server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/DeleteRows.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ private Optional<KeyExtent> deleteTabletFiles(Manager manager, FateId fateId) {
192192
.submit(
193193
tm -> tm.getFiles().containsAll(filesToAddMap.keySet())
194194
&& Collections.disjoint(tm.getFiles(), filesToDelete),
195-
() -> "delete tablet files");
195+
() -> "delete tablet files (as part of merge or deleterow operation) "+fateId);
196196
}
197197

198198
var results = tabletsMutator.process();

0 commit comments

Comments
 (0)