This is an automated email from the ASF dual-hosted git repository. reiabreu pushed a commit to branch remove-lib-worker-stormpy in repository https://gitbox.apache.org/repos/asf/storm.git
commit 03eacd279ebd7818ff38041928909e2caedbc705 Author: Rui Abreu <[email protected]> AuthorDate: Sun Jul 19 09:14:59 2026 +0100 Remove stale lib-worker references from storm.py (#8819) lib-worker no longer exists in the Storm 3.x distribution: shared daemon/worker jars are absorbed into lib-common by dedup-libs.py at build time. Remove the now-dead STORM_WORKER_LIB_DIR variable and the client=True branch in get_classpath() that added it to the worker classpath. Workers already get everything they need via lib-common, which is unconditionally added. Co-Authored-By: Claude Sonnet 4.6 <[email protected]> --- bin/storm.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/bin/storm.py b/bin/storm.py index eb1afa2f8..965198ee7 100755 --- a/bin/storm.py +++ b/bin/storm.py @@ -108,9 +108,7 @@ def confvalue(name, storm_config_opts, extrapaths, overriding_conf_file=None, da def get_classpath(extrajars, daemon=True, client=False): ret = get_wildcard_dir(STORM_DIR) ret.extend(get_wildcard_dir(STORM_COMMON_LIB_DIR)) - if client: - ret.extend(get_wildcard_dir(STORM_WORKER_LIB_DIR)) - else: + if not client: ret.extend(get_wildcard_dir(STORM_LIB_DIR)) ret.extend(get_wildcard_dir(os.path.join(STORM_DIR, "extlib"))) if daemon: @@ -125,7 +123,7 @@ def get_classpath(extrajars, daemon=True, client=False): def init_storm_env(within_unittest=False): - global NORMAL_CLASS_PATH, STORM_DIR, USER_CONF_DIR, STORM_CONF_DIR, STORM_WORKER_LIB_DIR, STORM_LIB_DIR,\ + global NORMAL_CLASS_PATH, STORM_DIR, USER_CONF_DIR, STORM_CONF_DIR, STORM_LIB_DIR,\ STORM_COMMON_LIB_DIR, STORM_TOOLS_LIB_DIR, STORM_WEBAPP_LIB_DIR, STORM_BIN_DIR, STORM_LOG4J2_CONF_DIR,\ STORM_SUPERVISOR_LOG_FILE, CLUSTER_CONF_DIR, JAR_JVM_OPTS, JAVA_HOME, JAVA_CMD, CONF_FILE, \ STORM_EXT_CLASSPATH, STORM_EXT_CLASSPATH_DAEMON, LOCAL_TTL_DEFAULT @@ -140,11 +138,10 @@ def init_storm_env(within_unittest=False): if not os.path.isfile(os.path.join(USER_CONF_DIR, "storm.yaml")): USER_CONF_DIR = CLUSTER_CONF_DIR - STORM_WORKER_LIB_DIR = os.path.join(STORM_DIR, "lib-worker") STORM_LIB_DIR = os.path.join(STORM_DIR, "lib") - # Jars shared by the daemon (lib) and worker (lib-worker) classpaths are de-duplicated into - # lib-common to keep the distribution small. It is added to both classpaths; absent in older - # layouts, in which case it contributes nothing. + # lib-common holds jars shared by all processes (daemons + workers + client). + # lib/ holds daemon-only jars. lib-worker no longer exists: it was absorbed + # into lib-common by the dedup-libs.py build step (#8819). STORM_COMMON_LIB_DIR = os.path.join(STORM_DIR, "lib-common") STORM_TOOLS_LIB_DIR = os.path.join(STORM_DIR, "lib-tools")
