brendan-skynet 0.9.317 → 0.9.318
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/skynet.rb +5 -0
- data/lib/skynet/active_record_extensions.rb +7 -7
- data/lib/skynet/manager.rb +1 -1
- data/lib/skynet/object_extensions.rb +6 -6
- data/skynet.gemspec +2 -2
- metadata +2 -2
data/lib/skynet.rb
CHANGED
@@ -33,6 +33,11 @@ end
|
|
33
33
|
|
34
34
|
class << Skynet
|
35
35
|
|
36
|
+
def master_tasks
|
37
|
+
::SkynetMessageQueue.find(:all, :select => "DISTINCT name, COUNT(*) total",:group => "name",:conditions => "payload_type='master'").
|
38
|
+
map{|q|"#{q.name} => #{q.total}"}.sort
|
39
|
+
end
|
40
|
+
|
36
41
|
# kinda like system() but gives me back a pid
|
37
42
|
def fork_and_exec(command)
|
38
43
|
sleep 0.01 # remove contention on manager drb object
|
@@ -31,11 +31,11 @@ module Skynet::ActiveRecordExtensions
|
|
31
31
|
:map_data => [data],
|
32
32
|
:name => "send_later #{self.class}##{method}",
|
33
33
|
:map_name => "",
|
34
|
-
:map_timeout =>
|
35
|
-
:reduce_timeout =>
|
36
|
-
:master_timeout =>
|
37
|
-
:master_result_timeout =>
|
38
|
-
:map_reduce_class =>
|
34
|
+
:map_timeout => 2.minutes,
|
35
|
+
:reduce_timeout => 2.minutes,
|
36
|
+
:master_timeout => 2.minutes,
|
37
|
+
:master_result_timeout => 2.minutes,
|
38
|
+
:map_reduce_class => Skynet::ActiveRecordAsync,
|
39
39
|
:master_retry => 0,
|
40
40
|
:map_retry => 0
|
41
41
|
}
|
@@ -182,9 +182,9 @@ module ActiveRecord
|
|
182
182
|
:map_data => batches,
|
183
183
|
:name => "each #{model_class} MASTER",
|
184
184
|
:map_name => "each #{model_class} MAP",
|
185
|
-
:map_timeout =>
|
185
|
+
:map_timeout => 2.minutes,
|
186
186
|
:master_timeout => 12.hours,
|
187
|
-
:master_result_timeout =>
|
187
|
+
:master_result_timeout => 2.minutes,
|
188
188
|
:master_retry => 0,
|
189
189
|
:map_retry => 0
|
190
190
|
}
|
data/lib/skynet/manager.rb
CHANGED
@@ -663,7 +663,7 @@ class Skynet
|
|
663
663
|
|
664
664
|
def self.run_manager(options)
|
665
665
|
@manager = Skynet::Manager.new(options)
|
666
|
-
@drb_manager = DRb.start_service("druby
|
666
|
+
@drb_manager = DRb.start_service("druby://#{Skynet::CONFIG[:SKYNET_LOCAL_MANAGER_HOST]}:#{Skynet::CONFIG[:SKYNET_LOCAL_MANAGER_PORT]}", @manager)
|
667
667
|
@manager.start_workers
|
668
668
|
info "MANAGER STARTED ON PORT: #{Skynet::CONFIG[:SKYNET_LOCAL_MANAGER_PORT]}"
|
669
669
|
@manager.run
|
@@ -4,7 +4,7 @@ module Skynet::ObjectExtensions
|
|
4
4
|
|
5
5
|
raise ArgumentError("send_later can not serialize blocks.") if block_given?
|
6
6
|
|
7
|
-
if is_a?(Class)
|
7
|
+
if is_a?(Class) or is_a?(Module)
|
8
8
|
data = {
|
9
9
|
:class_name => name,
|
10
10
|
:method => method,
|
@@ -22,12 +22,12 @@ module Skynet::ObjectExtensions
|
|
22
22
|
:single => true,
|
23
23
|
:mappers => 1,
|
24
24
|
:map_data => [data],
|
25
|
-
:name => "send_later #{self.class}##{method}",
|
25
|
+
:name => "send_later #{data[:class_name] ? "#{self}.#{method}" : "#{self.class}##{method}"}",
|
26
26
|
:map_name => "",
|
27
|
-
:map_timeout =>
|
28
|
-
:reduce_timeout =>
|
29
|
-
:master_timeout =>
|
30
|
-
:master_result_timeout =>
|
27
|
+
:map_timeout => 2.minutes,
|
28
|
+
:reduce_timeout => 2.minutes,
|
29
|
+
:master_timeout => 2.minutes,
|
30
|
+
:master_result_timeout => 2.minutes,
|
31
31
|
:map_reduce_class => Skynet::ObjectAsync,
|
32
32
|
:master_retry => 0,
|
33
33
|
:map_retry => 0
|
data/skynet.gemspec
CHANGED
@@ -1,10 +1,10 @@
|
|
1
1
|
Gem::Specification.new do |s|
|
2
2
|
s.name = %q{skynet}
|
3
|
-
s.version = "0.9.
|
3
|
+
s.version = "0.9.318"
|
4
4
|
|
5
5
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
6
6
|
s.authors = ["Adam Pisoni", "Brendan Baldwin"]
|
7
|
-
s.date = %q{
|
7
|
+
s.date = %q{2009-01-28}
|
8
8
|
s.description = %q{Skynet - A Ruby Map/Reduce Framework}
|
9
9
|
s.email = %q{apisoni@geni.com}
|
10
10
|
s.executables = ["skynet", "skynet_install", "skynet_tuplespace_server"]
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: brendan-skynet
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.9.
|
4
|
+
version: 0.9.318
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Adam Pisoni
|
@@ -10,7 +10,7 @@ autorequire:
|
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
12
|
|
13
|
-
date:
|
13
|
+
date: 2009-01-28 00:00:00 -08:00
|
14
14
|
default_executable:
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|