Skip to content

fixes NPE in bulkv1 code after failure #6622

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
keith-turner merged 2 commits into from
Oct 30, 2026
+8 −7
Merged

fixes NPE in bulkv1 code after failure #6622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9692c1
fixes NPE in bulkv1 code after failure
keith-turner Oct 29, 2026
0ef85cf
check bulk failures dir in IT
keith-turner Oct 30, 2026
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: 2 additions & 4 deletions core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/BulkImport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,11 +266,9 @@ public MLong(long i) {
}

public static Map<KeyExtent,Long> estimateSizes(AccumuloConfiguration acuConf, Path mapFile,
FileStatus status, Collection<KeyExtent> extents, FileSystem ns,
long fileSize, FileStatus status, Collection<KeyExtent> extents, FileSystem ns,
Comment thread
dlmarion marked this conversation as resolved.
Resolved
Cache<String,Long> fileLenCache, CryptoService cs) throws IOException {

final long fileSize = status.getLen();

@keith-turner keith-turner Oct 29, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the potential NPE when a status was removed from a map on failure.


if (extents.size() == 1) {
return Collections.singletonMap(extents.iterator().next(), fileSize);
}
Expand Down Expand Up @@ -584,7 +582,7 @@ public SortedMap<KeyExtent,Bulk.Files> computeFileToTabletMappings(FileSystem fs
// make sure file isn't going to too many tablets
checkTabletCount(maxTablets, extents.size(), filePath.toString());
Map<KeyExtent,Long> estSizes = estimateSizes(context.getConfiguration(), filePath,
fileStatus, extents, fs, fileLensCache, cs);
fileStatus.getLen(), fileStatus, extents, fs, fileLensCache, cs);
Map<KeyExtent,Bulk.FileInfo> pathLocations = new HashMap<>();
for (KeyExtent ke : extents) {
pathLocations.put(ke, new Bulk.FileInfo(filePath, estSizes.getOrDefault(ke, 0L)));
Expand Down
6 changes: 3 additions & 3 deletions server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,9 @@ private Map<Path,List<AssignmentInfo>> estimateSizes(final VolumeManager vm,
Path mapFile = entry.getKey();
FileSystem ns = context.getVolumeManager().getFileSystemByPath(mapFile);

estimatedSizes =
BulkImport.estimateSizes(context.getConfiguration(), mapFile, statuses.get(mapFile),
extentsOf(entry.getValue()), ns, null, tableConf.getCryptoService());
estimatedSizes = BulkImport.estimateSizes(context.getConfiguration(), mapFile,
mapFileSizes.get(mapFile), statuses.get(mapFile), extentsOf(entry.getValue()), ns,
null, tableConf.getCryptoService());
} catch (IOException e) {
log.warn("Failed to estimate map file sizes {}", e.getMessage());
}
Expand Down
3 changes: 3 additions & 0 deletions test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.accumulo.test.functional;

import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static org.junit.jupiter.api.Assertions.assertFalse;

import java.io.IOException;
import java.time.Duration;
Expand Down Expand Up @@ -99,6 +100,8 @@ static void runTest(AccumuloClient c, FileSystem fs, Path basePath, String table
TestIngest.ingest(c, fs, params);

bulkLoad(c, tableName, bulkFailures, files, useOld);
assertFalse(fs.listFiles(bulkFailures, false).hasNext());

VerifyParams verifyParams = new VerifyParams(c.properties(), tableName, N);
verifyParams.random = 56;
for (int i = 0; i < COUNT; i++) {
Expand Down
Loading