This is an automated email from the ASF dual-hosted git repository.
ddanielr pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push:
new 1d274eb60c Cleanup log messages in bulkv2 LoadFiles (#5466)
1d274eb60c is described below
commit 1d274eb60cc4509c785ba29d9dbe7868c2c4fd1f
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Fri Apr 11 15:36:59 2025 -0400
Cleanup log messages in bulkv2 LoadFiles (#5466)
* Cleaned up log messages in LoadFiles
Removed incorrect wording for messages related to bulk import.
Removed duplicate words due to logger class name.
Added Fate TxID to log message for recreating the TabletMetadata
---
.../apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
index df0b53bdbb..603de073cc 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
@@ -103,7 +103,7 @@ class LoadFiles extends ManagerRepo {
@Override
public long isReady(long tid, Manager manager) throws Exception {
- log.info("Starting bulk import for {} (tid = {})", bulkInfo.sourceDir,
FateTxId.formatTid(tid));
+ log.info("Starting for {} (tid = {})", bulkInfo.sourceDir,
FateTxId.formatTid(tid));
if (manager.onlineTabletServers().isEmpty()) {
log.warn("There are no tablet server to process bulkDir import, waiting
(tid = "
+ FateTxId.formatTid(tid) + ")");
@@ -455,7 +455,7 @@ class LoadFiles extends ManagerRepo {
Text startRow = loadMapEntry.getKey().prevEndRow();
String fmtTid = FateTxId.formatTid(tid);
- log.trace("{}: Starting bulk load at row: {}", fmtTid, startRow);
+ log.trace("{}: Started loading files at row: {}", fmtTid, startRow);
loader.start(bulkDir, manager, tid, bulkInfo.setTime);
@@ -475,8 +475,8 @@ class LoadFiles extends ManagerRepo {
tm -> PREV_COMP.compare(tm.getPrevEndRow(),
loadMapKey.prevEndRow()) >= 0,
skipDistance)) {
log.debug(
- "Next load mapping range {} not found in {} tablets,
recreating TabletMetadata to jump ahead",
- loadMapKey.prevEndRow(), skipDistance);
+ "{}: Next load mapping range {} not found in {} tablets,
recreating TabletMetadata to jump ahead",
+ fmtTid, loadMapKey.prevEndRow(), skipDistance);
tabletsMetadata.close();
tabletsMetadata =
factory.newTabletsMetadata(loadMapKey.prevEndRow());
pi = new PeekingIterator<>(tabletsMetadata.iterator());
@@ -495,7 +495,7 @@ class LoadFiles extends ManagerRepo {
if (importTimingStats.callCount > 0) {
log.debug(
- "Bulk import stats for {} (tid = {}): processed {} tablets in {}
calls which took {}ms ({} nanos). Skipped {} iterations which took {}ms ({}
nanos) or {}% of the processing time.",
+ "Stats for {} (tid = {}): processed {} tablets in {} calls which
took {}ms ({} nanos). Skipped {} iterations which took {}ms ({} nanos) or {}%
of the processing time.",
bulkInfo.sourceDir, FateTxId.formatTid(tid),
importTimingStats.tabletCount,
importTimingStats.callCount, totalProcessingTime.toMillis(),
totalProcessingTime.toNanos(), importTimingStats.wastedIterations,
