issue #35, automatically set JRuby 1.8/1.9 mode in remote cluster context
This commit is contained in:
parent
856d3e648f
commit
bc57741485
|
@ -121,7 +121,10 @@ module RedStorm
|
||||||
bolt.define_grouping(declarer)
|
bolt.define_grouping(declarer)
|
||||||
end
|
end
|
||||||
|
|
||||||
configurator = Configurator.new
|
# set the JRuby compatibility mode option for Storm workers, default to current JRuby mode
|
||||||
|
defaults = {"topology.worker.childopts" => "-Djruby.compat.version=#{RedStorm.jruby_mode_token}"}
|
||||||
|
|
||||||
|
configurator = Configurator.new(defaults)
|
||||||
configurator.instance_exec(env, &self.class.configure_block)
|
configurator.instance_exec(env, &self.class.configure_block)
|
||||||
|
|
||||||
submitter = (env == :local) ? @cluster = LocalCluster.new : StormSubmitter
|
submitter = (env == :local) ? @cluster = LocalCluster.new : StormSubmitter
|
||||||
|
|
|
@ -457,6 +457,7 @@ describe RedStorm::SimpleTopology do
|
||||||
Backtype::Config.should_receive(:new).and_return(config)
|
Backtype::Config.should_receive(:new).and_return(config)
|
||||||
config.should_receive(:setDebug).with(true)
|
config.should_receive(:setDebug).with(true)
|
||||||
config.should_receive(:setMaxTaskParallelism).with(3)
|
config.should_receive(:setMaxTaskParallelism).with(3)
|
||||||
|
config.should_receive(:put).with("topology.worker.childopts", "-Djruby.compat.version=#{RedStorm.jruby_mode_token}")
|
||||||
|
|
||||||
builder = mock(RedStorm::TopologyBuilder)
|
builder = mock(RedStorm::TopologyBuilder)
|
||||||
RedStorm::TopologyBuilder.should_receive(:new).and_return(builder)
|
RedStorm::TopologyBuilder.should_receive(:new).and_return(builder)
|
||||||
|
|
Loading…
Reference in New Issue