This is an automated email from the ASF dual-hosted git repository.
bipinprasad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new 05fb586 Revert "[STORM-3823] Change expected classpath to have "/*"
appende to directories. (#3442)"
05fb586 is described below
commit 05fb58624e6cf005879a47f81f2988fe4afbb1e5
Author: Bipin Prasad <[email protected]>
AuthorDate: Thu Feb 24 15:05:55 2022 -0800
Revert "[STORM-3823] Change expected classpath to have "/*" appende to
directories. (#3442)"
This reverts commit 6e5f6331f09e8aebd1d4f3394c5af1f000601786.
---
storm-client/test/py/test_storm_cli.py | 48 +++++++++++++++++-----------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/storm-client/test/py/test_storm_cli.py
b/storm-client/test/py/test_storm_cli.py
index c1f2380..14b8bd7 100644
--- a/storm-client/test/py/test_storm_cli.py
+++ b/storm-client/test/py/test_storm_cli.py
@@ -93,7 +93,7 @@ class TestStormCli(TestCase):
self.base_test(
["storm", "localconfvalue", "conf_name"], self.mock_popen,
mock.call([
self.java_cmd, '-client', '-Dstorm.options=',
- '-Dstorm.conf.file=', '-cp', self.storm_dir + '/*:' +
self.storm_dir + '/lib/*:' + self.storm_dir +'/extlib:' + self.storm_dir +
'/extlib-daemon:' + self.storm_dir + '/conf',
+ '-Dstorm.conf.file=', '-cp', self.storm_dir + '/*:' +
self.storm_dir + '/lib:' + self.storm_dir +'/extlib:' + self.storm_dir +
'/extlib-daemon:' + self.storm_dir + '/conf',
'org.apache.storm.command.ConfigValue', 'conf_name'
], stdout=-1
)
@@ -103,7 +103,7 @@ class TestStormCli(TestCase):
self.base_test(
["storm", "remoteconfvalue", "conf_name"], self.mock_popen,
mock.call([
self.java_cmd, '-client', '-Dstorm.options=',
- '-Dstorm.conf.file=', '-cp', self.storm_dir + '/*:' +
self.storm_dir + '/lib/*:' + self.storm_dir + '/extlib:' + self.storm_dir +
'/extlib-daemon:' + self.storm_dir + '/conf',
+ '-Dstorm.conf.file=', '-cp', self.storm_dir + '/*:' +
self.storm_dir + '/lib:' + self.storm_dir + '/extlib:' + self.storm_dir +
'/extlib-daemon:' + self.storm_dir + '/conf',
'org.apache.storm.command.ConfigValue', 'conf_name'
], stdout=-1
)
@@ -124,7 +124,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-client','-Ddaemon.name=', '-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir +
'/extlib:example/storm-starter/storm-starter-topologies-*.jar:' +
self.storm_dir +
'/conf:' + self.storm_dir +
'/bin:./external/storm-redis/storm-redis-1.1.0.jar:./external/storm-kafka-client/storm-kafka-client-1.1.0.jar"',
@@ -145,7 +145,7 @@ class TestStormCli(TestCase):
[self.java_cmd, '-client', '-Ddaemon.name=',
'-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir + '/extlib:' +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir + '/extlib:' +
self.storm_dir +
'/conf:' + self.storm_dir + '/bin:' + self.storm_dir +
'/lib-tools/sql/core',\
'-Dstorm.dependency.jars=', '-Dstorm.dependency.artifacts={}',
@@ -162,7 +162,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-client', '-Ddaemon.name=', '-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir + '/extlib:' + self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir + '/extlib:' + self.storm_dir +
'/extlib-daemon:' + self.storm_dir + '/conf:' + self.storm_dir
+ '/bin', 'org.apache.storm.command.KillTopology', 'doomed_topology'
])
)
@@ -175,7 +175,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-client', '-Ddaemon.name=',
'-Dstorm.options=test%3Dtest',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=',
'-Dstorm.conf.file=/some/other/storm.yaml',
- '-cp', self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
+ '-cp', self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir +
'/extlib:' + self.storm_dir +
'/extlib-daemon:' +
self.storm_dir + '/conf:' +
self.storm_dir +
@@ -191,7 +191,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-client', '-Ddaemon.name=', '-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir +
'/extlib:' + self.storm_dir + '/extlib-daemon:' +
self.storm_dir + '/conf:' +
self.storm_dir + '/bin', 'org.apache.storm.command.Blobstore',
'create',
'mytopo:data.tgz', '-f', 'data.tgz', '-a',
'u:alice:rwa,u:bob:rw,o::r'])
@@ -206,7 +206,7 @@ class TestStormCli(TestCase):
'-Dstorm.home=' + self.storm_dir,
'-Dstorm.log.dir=' + self.storm_dir + "/logs",
'-Djava.library.path=',
'-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir +
'/extlib:' + self.storm_dir + '/extlib-daemon:' +
self.storm_dir + '/conf:' +
self.storm_dir + '/bin', 'org.apache.storm.command.Blobstore',
'list'])
)
@@ -220,7 +220,7 @@ class TestStormCli(TestCase):
'-Dstorm.home=' + self.storm_dir,
'-Dstorm.log.dir=' + self.storm_dir + "/logs",
'-Djava.library.path=',
'-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir +
'/extlib:' + self.storm_dir + '/extlib-daemon:' +
self.storm_dir + '/conf:' +
self.storm_dir + '/bin', 'org.apache.storm.command.Blobstore',
'list', 'wordstotrack'])
)
@@ -233,7 +233,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-client', '-Ddaemon.name=', '-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir +
'/extlib:' + self.storm_dir + '/extlib-daemon:' +
self.storm_dir + '/conf:' +
self.storm_dir + '/bin', 'org.apache.storm.command.Blobstore',
'update', '-f',
'/wordsToTrack.list', 'wordstotrack'])
@@ -247,7 +247,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-client', '-Ddaemon.name=', '-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir +
'/extlib:' + self.storm_dir + '/extlib-daemon:' +
self.storm_dir + '/conf:' +
self.storm_dir + '/bin', 'org.apache.storm.command.Blobstore',
'cat', 'wordstotrack'])
)
@@ -260,7 +260,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-client', '-Ddaemon.name=', '-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir + '/extlib:' + self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir + '/extlib:' + self.storm_dir +
'/extlib-daemon:' + self.storm_dir + '/conf:' + self.storm_dir
+ '/bin',
'org.apache.storm.command.Activate', 'doomed_topology'
])
@@ -274,7 +274,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-client', '-Ddaemon.name=', '-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir + '/extlib:' + self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir + '/extlib:' + self.storm_dir +
'/extlib-daemon:' + self.storm_dir + '/conf:' + self.storm_dir
+
'/bin', 'org.apache.storm.command.Deactivate',
'doomed_topology'
])
@@ -288,7 +288,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-client', '-Ddaemon.name=', '-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir + '/extlib:' + self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir + '/extlib:' + self.storm_dir +
'/extlib-daemon:' + self.storm_dir + '/conf:' + self.storm_dir
+
'/bin', 'org.apache.storm.command.Rebalance', 'doomed_topology'
])
@@ -302,7 +302,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-client', '-Ddaemon.name=', '-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir + '/extlib:' + self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir + '/extlib:' + self.storm_dir +
'/extlib-daemon:' + self.storm_dir + '/conf:' + self.storm_dir
+
'/bin', 'org.apache.storm.command.ListTopologies'
])
@@ -316,7 +316,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-server', '-Ddaemon.name=nimbus',
'-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir +
'/extlib:' + self.storm_dir + '/extlib-daemon:' +
self.storm_dir + '/conf',
'-Djava.deserialization.disabled=true',
'-Dlogfile.name=nimbus.log',
'-Dlog4j.configurationFile=' + self.storm_dir +
'/log4j2/cluster.xml',
@@ -332,7 +332,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-server', '-Ddaemon.name=supervisor',
'-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir +
'/extlib:' + self.storm_dir + '/extlib-daemon:' +
self.storm_dir + '/conf',
'-Djava.deserialization.disabled=true',
'-Dlogfile.name=supervisor.log',
'-Dlog4j.configurationFile=' + self.storm_dir +
'/log4j2/cluster.xml',
@@ -348,7 +348,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-server', '-Ddaemon.name=pacemaker',
'-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir +
'/extlib:' + self.storm_dir + '/extlib-daemon:' +
self.storm_dir + '/conf',
'-Djava.deserialization.disabled=true',
'-Dlogfile.name=pacemaker.log',
'-Dlog4j.configurationFile=' + self.storm_dir +
'/log4j2/cluster.xml',
@@ -364,7 +364,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-server', '-Ddaemon.name=ui',
'-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir +
'/extlib:' + self.storm_dir + '/extlib-daemon:' +
self.storm_dir +
'/lib-webapp:' + self.storm_dir + '/conf',
'-Djava.deserialization.disabled=true',
'-Dlogfile.name=ui.log',
@@ -381,7 +381,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-server', '-Ddaemon.name=logviewer',
'-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir +
'/extlib:' + self.storm_dir + '/extlib-daemon:' +
self.storm_dir +
'/lib-webapp:' + self.storm_dir + '/conf',
'-Djava.deserialization.disabled=true',
'-Dlogfile.name=logviewer.log',
@@ -398,7 +398,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-server', '-Ddaemon.name=drpc',
'-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir +
'/extlib:' + self.storm_dir + '/extlib-daemon:' +
self.storm_dir +
'/lib-webapp:' + self.storm_dir + '/conf',
'-Djava.deserialization.disabled=true',
'-Dlogfile.name=drpc.log',
@@ -415,7 +415,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-client', '-Ddaemon.name=', '-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir + '/extlib:' + self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir + '/extlib:' + self.storm_dir +
'/extlib-daemon:' + self.storm_dir + '/conf:' + self.storm_dir
+
'/bin', 'org.apache.storm.command.BasicDrpcClient', 'exclaim',
'a', 'exclaim', 'b', 'test', 'bar'
])
@@ -427,7 +427,7 @@ class TestStormCli(TestCase):
self.java_cmd, '-client', '-Ddaemon.name=', '-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs",
'-Djava.library.path=', '-Dstorm.conf.file=', '-cp',
- self.storm_dir + '/*:' + self.storm_dir + '/lib/*:' +
self.storm_dir + '/extlib:' + self.storm_dir +
+ self.storm_dir + '/*:' + self.storm_dir + '/lib:' +
self.storm_dir + '/extlib:' + self.storm_dir +
'/extlib-daemon:' + self.storm_dir + '/conf:' + self.storm_dir
+
'/bin', 'org.apache.storm.command.BasicDrpcClient', '-f',
'exclaim', 'a', 'b'
])
@@ -440,7 +440,7 @@ class TestStormCli(TestCase):
self.java_cmd, [
self.java_cmd, '-client', '-Ddaemon.name=', '-Dstorm.options=',
'-Dstorm.home=' + self.storm_dir, '-Dstorm.log.dir=' +
self.storm_dir + "/logs", '-Djava.library.path=',
- '-Dstorm.conf.file=', '-cp', self.storm_dir + '/*:' +
self.storm_dir + '/lib/*:' +
+ '-Dstorm.conf.file=', '-cp', self.storm_dir + '/*:' +
self.storm_dir + '/lib:' +
self.storm_dir + '/extlib:' + self.storm_dir +
'/extlib-daemon:' + self.storm_dir + '/conf:' +
self.storm_dir + '/bin', 'org.apache.storm.command.HealthCheck'
])
