gizzmo 0.11.2 → 0.11.3

data/test/nameserver_spec.rb

@@ -96,7 +96,7 @@ describe Gizzard::Nameserver::Manifest do
     @nameserver = Gizzard::Nameserver.new("localhost:1234")
     @state = Object.new
 
-    mock(@nameserver).dump_nameserver(0) { @state }
+    mock(@nameserver).dump_nameserver([0]) { [@state] }
     mock(@state).forwardings { @forwardings }
     mock(@state).links { @links }
     mock(@state).shards { @shardinfos }

data/test/scheduler_spec.rb

@@ -15,17 +15,17 @@ describe Gizzard::Transformation::Scheduler do
       shards = [info('127.0.0.1', 't_0_0001', 'TestShard')]
       mock(@nameserver).get_busy_shards { shards }
 
-      @scheduler.busy_shards.should == shards.map {|s| s.id }
-      @scheduler.busy_shards.should == shards.map {|s| s.id }
+      @scheduler.busy_shards.should == shards.map {|s| s.id }.to_set
+      @scheduler.busy_shards.should == shards.map {|s| s.id }.to_set
     end
 
     it "resets after calling reload_busy_shards" do
       shards = [info('127.0.0.1', 't_0_0001', 'TestShard')]
       mock(@nameserver).get_busy_shards { shards }.twice
 
-      @scheduler.busy_shards.should == shards.map {|s| s.id }
+      @scheduler.busy_shards.should == shards.map {|s| s.id }.to_set
       @scheduler.reload_busy_shards
-      @scheduler.busy_shards.should == shards.map {|s| s.id }
+      @scheduler.busy_shards.should == shards.map {|s| s.id }.to_set
     end
   end
 
@@ -35,15 +35,15 @@ describe Gizzard::Transformation::Scheduler do
       stub(@nameserver).get_busy_shards { shards }
       @scheduler = Gizzard::Transformation::Scheduler.new(@nameserver, 't', @transformations, :copies_per_host => 2)
 
-      @scheduler.busy_hosts.should == []
+      @scheduler.busy_hosts.should == Set.new
 
       shards = [info('127.0.0.1', 't_0_0001', 'TestShard')]
       @scheduler.reload_busy_shards
-      @scheduler.busy_hosts.should == []
+      @scheduler.busy_hosts.should == Set.new
 
       shards = [info('127.0.0.1', 't_0_0001', 'TestShard'), info('127.0.0.1', 't_0_0002', 'TestShard')]
       @scheduler.reload_busy_shards
-      @scheduler.busy_hosts.should == ['127.0.0.1']
+      @scheduler.busy_hosts.should == ['127.0.0.1'].to_set
     end
 
     it "respects passed in extra hosts" do
@@ -51,9 +51,9 @@ describe Gizzard::Transformation::Scheduler do
       stub(@nameserver).get_busy_shards { shards }
       @scheduler = Gizzard::Transformation::Scheduler.new(@nameserver, 't', @transformations, :copies_per_host => 2)
 
-      @scheduler.busy_hosts.should == []
-      @scheduler.busy_hosts(["127.0.0.1"]).should == []
-      @scheduler.busy_hosts(["127.0.0.1", "127.0.0.1"]).should == ["127.0.0.1"]
+      @scheduler.busy_hosts.should == Set.new
+      @scheduler.busy_hosts(["127.0.0.1"]).should == Set.new
+      @scheduler.busy_hosts(["127.0.0.1", "127.0.0.1"]).should == ["127.0.0.1"].to_set
     end
   end
 end

data/test/spec_helper.rb

@@ -11,6 +11,13 @@ JOB_PORT     = 7921
 SERVICE_DATABASE    = 'gizzard_test_integration'
 NAMESERVER_DATABASE = 'gizzard_test_integration_ns'
 
+class Object
+  def T; p self; self end
+end
+
+class NilClass
+  def T; p self; self end
+end
 
 require 'rubygems'
 require 'spec'
@@ -78,6 +85,8 @@ def reset_nameserver(db = NAMESERVER_DATABASE)
   $mysql.query("delete from `#{db}`.shard_children")
   $mysql.query("delete from `#{db}`.forwardings")
   $mysql.query("delete from `#{db}`.hosts")
+
+  nameserver.reload_config rescue nil
 end
 
 def reset_databases!
@@ -89,8 +98,7 @@ def reset_databases!
   rescue MysqlError
 
     begin
-      m = Gizzard::Manager.new("localhost", MANAGER_PORT, '/dev/null', false)
-      m.rebuild_schema
+      nameserver.rebuild_schema
     rescue Errno::ECONNREFUSED
     end
   end
@@ -99,7 +107,7 @@ end
 def read_nameserver_db(db = NAMESERVER_DATABASE)
   { :shards      => map_rs($mysql.query("select * from `#{db}`.shards"), &method(:as_shard)),
     :links       => map_rs($mysql.query("select * from `#{db}`.shard_children"), &method(:as_link)),
-    :forwardings => map_rs($mysql.query("select * from `#{db}`.forwardings"), &method(:as_forwarding)),
+    :forwardings => map_rs($mysql.query("select * from `#{db}`.forwardings where deleted = 0"), &method(:as_forwarding)),
     :hosts       => map_rs($mysql.query("select * from `#{db}`.hosts"), &method(:as_host)) }
 end
 
@@ -129,11 +137,24 @@ def as_host(h)
   Gizzard::Host.new(h['hostname'], h['port'].to_i, h['cluster'], h['status'].to_i)
 end
 
+def gizzmo(cmd)
+  result = `cd #{ROOT_DIR} && ruby -rubygems -Ilib bin/gizzmo -H localhost -P #{MANAGER_PORT} #{cmd} 2>&1`
+  puts result if ENV['GIZZMO_OUTPUT']
+  result
+end
+
+def nameserver
+  @nameserver ||= Gizzard::Nameserver.new('localhost:' + MANAGER_PORT.to_s)
+end
+
+alias ns nameserver
 
 # setup
 
 mysql_connect!("localhost", '', '')
 reset_databases!
-start_test_server!
 
-at_exit { stop_test_server! }
+unless ENV['EXTERNAL_TEST_SERVER']
+  start_test_server!
+  at_exit { stop_test_server! }
+end

data/test/test_server/project/build/Project.scala

@@ -7,7 +7,7 @@ class GizzmoServerProject(info: ProjectInfo) extends StandardProject(info) {
   override def filterScalaJars = false
 
   val scalaTools = "org.scala-lang" % "scala-compiler" % "2.7.7"
-  val gizzard    = "com.twitter" % "gizzard" % "1.6-mc-SNAPSHOT"
+  val gizzard    = "com.twitter" % "gizzard" % "1.6-fr-SNAPSHOT"
 
   val specs = "org.scala-tools.testing" % "specs" % "1.6.2.1" % "test"
 }

data/test/test_server/project/plugins/Plugins.scala

@@ -2,5 +2,5 @@ import sbt._
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
   val twitterMaven = "twitter.com" at "http://maven.twttr.com/"
-  val defaultProject = "com.twitter" % "standard-project" % "0.7.12"
+  val defaultProject = "com.twitter" % "standard-project" % "0.7.17"
 }

data/test/transformation_spec.rb

@@ -39,6 +39,14 @@ describe Gizzard::Transformation do
     end
   end
 
+  describe "eql?" do
+    it "is true for two transformation involving equivalent templates" do
+      templates = lambda { ["SqlShard(host1)", "SqlShard(host2)"].map {|s| mk_template s } }
+      Gizzard::Transformation.new(*templates.call).should.eql? Gizzard::Transformation.new(*templates.call)
+      Gizzard::Transformation.new(*templates.call).hash.should.eql? Gizzard::Transformation.new(*templates.call).hash
+    end
+  end
+
   # internal method tests
 
   describe "operations" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gizzmo
 version: !ruby/object:Gem::Version 
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 11
-  - 2
-  version: 0.11.2
+  - 3
+  version: 0.11.3
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 -08:00
+date: 2011-01-26 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -42,6 +43,7 @@ files:
 - lib/gizzard/digest.rb
 - lib/gizzard/migrator.rb
 - lib/gizzard/nameserver.rb
+- lib/gizzard/rebalancer.rb
 - lib/gizzard/shard_template.rb
 - lib/gizzard/thrift.rb
 - lib/gizzard/transformation.rb
@@ -83,6 +85,9 @@ files:
 - test/test_server/src/main/scala/TestServer.scala
 - test/test_server/src/main/thrift/TestServer.thrift
 - test/transformation_spec.rb
+- test/test_server/target/gen-rb/test_server.rb
+- test/test_server/target/gen-rb/test_server_constants.rb
+- test/test_server/target/gen-rb/test_server_types.rb
 has_rdoc: true
 homepage: http://github.com/twitter/gizzmo
 licenses: []
@@ -93,23 +98,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Gizzmo is a command-line client for managing gizzard clusters.
@@ -120,4 +129,7 @@ test_files:
 - test/scheduler_spec.rb
 - test/shard_template_spec.rb
 - test/spec_helper.rb
+- test/test_server/target/gen-rb/test_server.rb
+- test/test_server/target/gen-rb/test_server_constants.rb
+- test/test_server/target/gen-rb/test_server_types.rb
 - test/transformation_spec.rb