Skip to content

Fix silent exception swallow in LocalFsBlobStore.prepare() leaving stormClusterState null #8416

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
rzo1 merged 2 commits into from
Mar 3, 2026
Merged

Fix silent exception swallow in LocalFsBlobStore.prepare() leaving stormClusterState null #8416

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
3fd1eb0
Fix silent exception swallow in LocalFsBlobStore.prepare()
jnioche Mar 2, 2026
e8216f7
Fix tests that relied on silent exception swallowing in LocalFsBlobSt…
jnioche Mar 3, 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
2 changes: 1 addition & 1 deletion storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void prepare(Map<String, Object> conf, String overrideBase, NimbusInfo ni
try {
this.stormClusterState = ClusterUtils.mkStormClusterState(conf, new ClusterStateContext(DaemonType.NIMBUS, conf));
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("Failed to initialize cluster state for LocalFsBlobStore", e);
}
timer = new Timer("BLOB-STORE-TIMER", true);
this.leaderElector = leaderElector;
Expand Down
9 changes: 7 additions & 2 deletions storm-server/src/test/java/org/apache/storm/blobstore/LocalFsBlobStoreSynchronizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.apache.storm.shade.org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.storm.shade.org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.storm.utils.Utils;
import org.apache.storm.testing.InProcessZookeeper;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -46,6 +47,7 @@ public class LocalFsBlobStoreSynchronizerTest {
private static Map<String, Object> conf = new HashMap<>();

private File baseFile;
private InProcessZookeeper zk;

// Method which initializes nimbus admin
@BeforeAll
Expand All @@ -55,13 +57,15 @@ public static void initializeConfigs() {
}

@BeforeEach
public void init() {
public void init() throws Exception {
baseFile = new File("target/blob-store-test-" + UUID.randomUUID());
zk = new InProcessZookeeper();
}

@AfterEach
public void cleanUp() throws IOException {
public void cleanUp() throws Exception {
FileUtils.deleteDirectory(baseFile);
zk.close();
}

private LocalFsBlobStore initLocalFs() {
Expand All @@ -70,6 +74,7 @@ private LocalFsBlobStore initLocalFs() {
conf.putAll(Utils.readStormConfig());
conf.put(Config.STORM_LOCAL_DIR, baseFile.getAbsolutePath());
conf.put(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN, "org.apache.storm.security.auth.DefaultPrincipalToLocal");
conf.put(Config.STORM_ZOOKEEPER_PORT, zk.getPort());
store.prepare(conf, null, null, null);
return store;
}
Expand Down
28 changes: 16 additions & 12 deletions storm-server/src/test/java/org/apache/storm/localizer/AsyncLocalizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.apache.storm.generated.SettableBlobMeta;
import org.apache.storm.generated.StormTopology;
import org.apache.storm.security.auth.DefaultPrincipalToLocal;
import org.apache.storm.testing.InProcessZookeeper;
import org.apache.storm.testing.TmpPath;
import org.apache.storm.utils.ConfigUtils;
import org.apache.storm.utils.ReflectionUtils;
Expand Down Expand Up @@ -791,18 +792,21 @@ public void testFailAcls() {
}

@Test
public void testKeyNotFoundException() {
assertThrows(KeyNotFoundException.class, () -> {
Map<String, Object> conf = Utils.readStormConfig();
String key1 = "key1";
conf.put(Config.STORM_LOCAL_DIR, "target");
LocalFsBlobStore bs = new LocalFsBlobStore();
LocalFsBlobStore spy = spy(bs);
Mockito.doReturn(true).when(spy).checkForBlobOrDownload(key1);
Mockito.doNothing().when(spy).checkForBlobUpdate(key1);
spy.prepare(conf, null, null, null);
spy.getBlob(key1, null);
});
public void testKeyNotFoundException() throws Exception {
try (InProcessZookeeper zk = new InProcessZookeeper()) {
assertThrows(KeyNotFoundException.class, () -> {
Map<String, Object> conf = Utils.readStormConfig();
String key1 = "key1";
conf.put(Config.STORM_LOCAL_DIR, "target");
conf.put(Config.STORM_ZOOKEEPER_PORT, zk.getPort());
LocalFsBlobStore bs = new LocalFsBlobStore();
LocalFsBlobStore spy = spy(bs);
Mockito.doReturn(true).when(spy).checkForBlobOrDownload(key1);
Mockito.doNothing().when(spy).checkForBlobUpdate(key1);
spy.prepare(conf, null, null, null);
spy.getBlob(key1, null);
});
}
}

@Test
Expand Down