gizzmo 0.12.0 → 0.12.1

data/LICENSE

@@ -1,177 +1,13 @@
-Copyright (c) 2010 Twitter, Inc.
+Copyright 2011 Twitter, Inc.
 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
+http://www.apache.org/licenses/LICENSE-2.0
 
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.rdoc

@@ -7,7 +7,7 @@ Gizzmo is a command-line client for managing gizzard clusters.
 Installation is a simple gem install.  You may find it useful to create a ~/.gizzmorc file, which is simply YAML key/values.  The keys are the long-style command line option keys converted into Ruby-style variables.  A common .gizzmorc will simply be:
 
     host: localhost
-    port: 7917
+    port: 7920
 
 == Usage
 
@@ -37,7 +37,7 @@ Contributions are welcome!  Please send a pull request, or if you're internal to
 
 The tests may be somewhat difficult to run outside of Twitter.  They assume the following:
 
-1. You have a running FlockDB development environment exposing a ShardManager over thrift on localhost:7917
+1. You have a running FlockDB development environment exposing a ShardManager over thrift on localhost:7920
 2. You don't mind blowing away the data in your dev environment.
 3. Your MySQL username and password are in the environment variables DB_USERNAME and DB_PASSWORD
 

data/VERSION

@@ -1 +1 @@
-0.12.0
+0.12.1

data/gizzmo.gemspec

@@ -1,99 +1,84 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{gizzmo}
-  s.version = "0.12.0"
+  s.version = "0.12.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2011-05-05}
+  s.date = %q{2011-10-20}
   s.description = %q{Gizzmo is a command-line client for managing gizzard clusters.}
   s.email = %q{kmaxwell@twitter.com}
-  s.executables = ["gizzmo", "setup_shards"]
+  s.executables = ["setup_shards", "gizzmo"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/gizzmo",
-     "bin/setup_shards",
-     "gizzmo.gemspec",
-     "lib/gizzard.rb",
-     "lib/gizzard/commands.rb",
-     "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",
-     "lib/gizzard/transformation_op.rb",
-     "lib/gizzard/transformation_scheduler.rb",
-     "lib/gizzmo.rb",
-     "lib/vendor/thrift_client/simple.rb",
-     "test/config.yaml",
-     "test/expected/deep.txt",
-     "test/expected/dry-wrap-table_b_0.txt",
-     "test/expected/empty-file.txt",
-     "test/expected/find-only-sql-shard-type.txt",
-     "test/expected/forwardings.txt",
-     "test/expected/help-info.txt",
-     "test/expected/info.txt",
-     "test/expected/links-for-replicating_table_b_0.txt",
-     "test/expected/links-for-table_b_0.txt",
-     "test/expected/links-for-table_repl_0.txt",
-     "test/expected/original-find.txt",
-     "test/expected/subtree-info.txt",
-     "test/expected/subtree.txt",
-     "test/expected/unwrapped-replicating_table_b_0.txt",
-     "test/expected/unwrapped-table_b_0.txt",
-     "test/expected/wrap-table_b_0.txt",
-     "test/gizzmo_spec.rb",
-     "test/helper.rb",
-     "test/nameserver_spec.rb",
-     "test/recreate.sql",
-     "test/scheduler_spec.rb",
-     "test/shard_template_spec.rb",
-     "test/spec.opts",
-     "test/spec_helper.rb",
-     "test/test.sh",
-     "test/test_server/.gitignore",
-     "test/test_server/project/build.properties",
-     "test/test_server/project/build/Project.scala",
-     "test/test_server/project/plugins/Plugins.scala",
-     "test/test_server/src/main/scala/Main.scala",
-     "test/test_server/src/main/scala/TestServer.scala",
-     "test/test_server/src/main/thrift/TestServer.thrift",
-     "test/transformation_spec.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/gizzmo",
+    "bin/setup_shards",
+    "gizzmo.gemspec",
+    "lib/gizzard.rb",
+    "lib/gizzard/commands.rb",
+    "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",
+    "lib/gizzard/transformation_op.rb",
+    "lib/gizzard/transformation_scheduler.rb",
+    "lib/gizzmo.rb",
+    "lib/vendor/thrift_client/simple.rb",
+    "test/config.yaml",
+    "test/expected/deep.txt",
+    "test/expected/dry-wrap-table_b_0.txt",
+    "test/expected/empty-file.txt",
+    "test/expected/find-only-sql-shard-type.txt",
+    "test/expected/forwardings.txt",
+    "test/expected/help-info.txt",
+    "test/expected/info.txt",
+    "test/expected/links-for-replicating_table_b_0.txt",
+    "test/expected/links-for-table_b_0.txt",
+    "test/expected/links-for-table_repl_0.txt",
+    "test/expected/original-find.txt",
+    "test/expected/subtree-info.txt",
+    "test/expected/subtree.txt",
+    "test/expected/unwrapped-replicating_table_b_0.txt",
+    "test/expected/unwrapped-table_b_0.txt",
+    "test/expected/wrap-table_b_0.txt",
+    "test/gizzmo_spec.rb",
+    "test/helper.rb",
+    "test/nameserver_spec.rb",
+    "test/recreate.sql",
+    "test/scheduler_spec.rb",
+    "test/shard_template_spec.rb",
+    "test/spec.opts",
+    "test/spec_helper.rb",
+    "test/test.sh",
+    "test/test_server/.gitignore",
+    "test/test_server/project/build.properties",
+    "test/test_server/project/build/Project.scala",
+    "test/test_server/project/plugins/Plugins.scala",
+    "test/test_server/src/main/scala/Main.scala",
+    "test/test_server/src/main/scala/TestServer.scala",
+    "test/test_server/src/main/thrift/TestServer.thrift",
+    "test/transformation_spec.rb"
   ]
   s.homepage = %q{http://github.com/twitter/gizzmo}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.1}
   s.summary = %q{Gizzmo is a command-line client for managing gizzard clusters.}
-  s.test_files = [
-    "test/gizzmo_spec.rb",
-     "test/helper.rb",
-     "test/nameserver_spec.rb",
-     "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"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/gizzard/commands.rb

@@ -640,6 +640,8 @@ module Gizzard
         manager.remove_link(link.up_id, link.down_id)
         manager.add_link(link.up_id, to_shard_id, link.weight)
       end
+      manager.remove_link(replica_shard_id, from_shard_id)
+      manager.remove_link(replica_shard_id, write_only_shard_id)
       manager.replace_forwarding(replica_shard_id, to_shard_id)
       manager.delete_shard(replica_shard_id)
       manager.delete_shard(write_only_shard_id)

data/lib/gizzard/nameserver.rb

@@ -86,7 +86,7 @@ module Gizzard
   class Nameserver
     include ParallelMap
 
-    DEFAULT_PORT    = 7917
+    DEFAULT_PORT    = 7920
     DEFAULT_RETRIES = 10
     PARALLELISM     = 10
 

data/lib/gizzard/transformation_scheduler.rb

@@ -49,10 +49,11 @@ module Gizzard
 
     def apply!
       @start_time = Time.now
-
+      control_interrupts
+      
       loop do
         reload_busy_shards
-
+        
         cleanup_jobs
         schedule_jobs(max_copies - busy_shards.length)
 
@@ -219,5 +220,27 @@ module Gizzard
         [days,hours,minutes,seconds].compact.map {|i| "%0.2i" % i }.join(":")
       end
     end
+
+    # Trap interrupt (Ctrl+C) for better/safer handling
+    def control_interrupts
+      ints_left = 3
+      trap("INT") do
+        ints_left -= 1 
+        if !@jobs_pending.empty?
+          # get rid of scheduled jobs
+          puts "\nINTERRUPT RECEIVED! Cancelling jobs not yet started. Finishing jobs in progress..."
+          @jobs_pending.clear
+        end
+        if ints_left > 0
+          puts "\nPress Ctrl+C #{ints_left} more time#{'s' if ints_left > 1} to terminate jobs in progress. This is dangerous."
+        end
+        if ints_left == 1
+          puts "This could leave the database in a bad state. Make sure you know what you're doing."
+        elsif ints_left == 0
+          puts "\nTerminating on interrupt..."
+          exit 1
+        end
+      end
+    end
   end
 end

data/lib/gizzmo.rb

@@ -317,7 +317,7 @@ subcommands = {
     end
   end,
   'transform-tree' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{zero} transform-tree [options] ROOT_SHARD_ID TEMPLATE"
+    opts.banner = "Usage: #{zero} transform-tree [options] TEMPLATE ROOT_SHARD_ID"
     separators(opts, DOC_STRINGS['transform-tree'])
 
     add_scheduler_opts subcommand_options, opts
@@ -392,7 +392,7 @@ global = OptionParser.new do |opts|
   opts.separator "simply contains:"
   opts.separator ""
   opts.separator "    hosts: localhost"
-  opts.separator "    port: 7917"
+  opts.separator "    port: 7920"
   opts.separator ""
   opts.separator "Subcommands:"
   subcommands.keys.compact.sort.each do |sc|
@@ -547,5 +547,6 @@ rescue Errno::EPIPE
   # head -1, then this script will keep running after head closes.  We don't care, and
   # seeing the backtrace is annoying!
 rescue Interrupt
+  STDERR.puts "\nERROR: Received an unhandled interrupt"
   exit 1
 end

data/test/config.yaml

@@ -1,2 +1,2 @@
 host: localhost
-port: 7917
+port: 7920

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gizzmo
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: false
+  hash: 45
+  prerelease: 
   segments: 
   - 0
   - 12
-  - 0
-  version: 0.12.0
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -15,22 +15,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -07:00
+date: 2011-10-20 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: Gizzmo is a command-line client for managing gizzard clusters.
 email: kmaxwell@twitter.com
 executables: 
-- gizzmo
 - setup_shards
+- gizzmo
 extensions: []
 
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -85,16 +84,13 @@ 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: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -118,18 +114,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Gizzmo is a command-line client for managing gizzard clusters.
-test_files: 
-- test/gizzmo_spec.rb
-- test/helper.rb
-- test/nameserver_spec.rb
-- 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
+test_files: []
+

data/.gitignore

@@ -1,24 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-tmp
-gizzmo.log
-*.gem