flare-tools 0.4.5.1 → 0.5.0

data/.gitignore

@@ -0,0 +1,24 @@
+doc
+pkg
+work/*.log
+work/*
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.8.7
+  - 2.0.0
+  - 2.1.3
+before_install:
+  - travis_retry sudo apt-get update
+  - travis_retry sudo apt-get install libtokyocabinet-dev
+  - travis_retry sudo apt-get install libboost-program-options-dev libboost-regex-dev libboost-serialization-dev libboost-thread-dev
+  - travis_retry sudo apt-get install uuid-dev
+  - git clone https://github.com/gree/flare.git flare
+  - (cd flare && ./autogen.sh)
+  - (cd flare && ./configure)
+  - (cd flare && sudo make install)

data/Gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'log4r'
+gem 'zookeeper', '>=1.2.6'
+gem 'tokyocabinet', '>=1.29'
+gem 'rdoc'
+gem 'test-unit'
+gem 'ci_reporter', '=1.9.3'
+gem 'rake'

data/Gemfile.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.2)
+    ci_reporter (1.9.3)
+      builder (>= 2.1.2)
+    json (1.8.1)
+    log4r (1.1.10)
+    power_assert (0.1.4)
+    rake (10.3.2)
+    rdoc (4.1.2)
+      json (~> 1.4)
+    test-unit (3.0.1)
+      power_assert
+    tokyocabinet (1.29.1)
+    zookeeper (1.4.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ci_reporter (= 1.9.3)
+  log4r
+  rake
+  rdoc
+  test-unit
+  tokyocabinet (>= 1.29)
+  zookeeper (>= 1.2.6)

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.5.0 / 2014-10-15
+* Refactoring structures
+  * Refactoring.
+  * Replaced gem packaging tool. Use bundler instead of hoe & newgem.
+
 === 0.4.5 / 2012-10-17
 * Minor Enhancements
   * Fixed install target of Makefile.

data/Makefile

@@ -0,0 +1,25 @@
+
+BINDIR=/usr/bin
+RUBYLIBDIR=/usr/lib/ruby/${RUBYVER}
+SRCDIR=.
+BINS=flare-admin flare-argv0 flare-deploy flare-keychecker flare-part flare-ping flare-stats flare-zkadmin
+
+install:
+	install -d ${DESTDIR}${BINDIR}
+	install -m 755 ${SRCDIR}/bin/* ${DESTDIR}${BINDIR}
+	echo ${addprefix ${DESTDIR}${BINDIR}/,${BINS}} | xargs -n 1 sed -i 1c\#!/usr/bin/ruby${RUBYVER}
+	install -d ${DESTDIR}${RUBYLIBDIR}/flare
+	install -m 644 ${SRCDIR}/lib/flare/*.rb ${DESTDIR}${RUBYLIBDIR}/flare
+	install -d ${DESTDIR}${RUBYLIBDIR}/flare/tools
+	install -m 644 ${SRCDIR}/lib/flare/tools/*.rb ${DESTDIR}${RUBYLIBDIR}/flare/tools
+	install -d ${DESTDIR}${RUBYLIBDIR}/flare/tools/cli
+	install -m 644 ${SRCDIR}/lib/flare/tools/cli/*.rb ${DESTDIR}${RUBYLIBDIR}/flare/tools/cli
+	install -d ${DESTDIR}${RUBYLIBDIR}/flare/util
+	install -m 644 ${SRCDIR}/lib/flare/util/*.rb ${DESTDIR}${RUBYLIBDIR}/flare/util
+	install -d ${DESTDIR}${RUBYLIBDIR}/flare/net
+	install -m 644 ${SRCDIR}/lib/flare/net/*.rb ${DESTDIR}${RUBYLIBDIR}/flare/net
+	install -d ${DESTDIR}${RUBYLIBDIR}/flare/test
+	install -m 644 ${SRCDIR}/lib/flare/test/*.rb ${DESTDIR}${RUBYLIBDIR}/flare/test
+
+clean:
+

data/README.txt

@@ -2,7 +2,7 @@
 
 = flare-tools
 
-http://labs.gree.jp/Top/OpenSource/Flare-en.html
+https://github.com/gree/flare/wiki
 
 Flare-tools is a collection of command line tools to maintain a flare cluster.
 
@@ -38,7 +38,7 @@ License::   MIT-style
 
 * Install Flare
 
-Please see the web pages about {Flare}[http://labs.gree.jp/Top/OpenSource/Flare-en.html] in GREE Labs.
+Please see the web pages about {Flare}[https://github.com/gree/flare/wiki].
 
 * Install flare-tools
  # gem install flare-tools

data/Rakefile

@@ -1,37 +1,36 @@
 
-$LOAD_PATH.unshift File.dirname(__FILE__)+"/lib"
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/lib"
 
 require 'rubygems'
-gem 'hoe', '>= 2.1.0'
-require 'hoe'
-gem 'rdoc'
+require 'bundler/setup'
+require "bundler/gem_tasks"
 require 'rdoc'
 require 'rdoc/markup'
 require 'rdoc/markup/formatter'
 require 'rdoc/markup/to_ansi'
+require 'rake/testtask'
+require 'ci/reporter/rake/test_unit_loader'
 
 require 'fileutils'
 require 'flare/tools'
 
-Hoe.plugin :newgem
-
-$hoe = Hoe.spec 'flare-tools' do
-  self.version = Flare::Tools::VERSION
-  self.developer 'kikehara', 'kiyoshi.ikehara@gree.net'
-  self.urls = ['http://github.com/gree/flare-tools']
-  self.summary = "Management Tools for Flare"
-  self.post_install_message = 'PostInstall.txt'
-  self.description = "Flare-tools is a collection of tools for Flare distributed key-value store."
-  self.readme_file = "README.txt"
-  self.extra_deps = [['log4r', '>= 1.1.4'], ['zookeeper', '>= 1.2.6'], ['tokyocabinet', '>= 1.29']]
-  self.rubyforge_name = 'flare-tools'
-  self.extra_rdoc_files = []
-end
-
-require 'newgem/tasks'
 Dir['tasks/**/*.rake'].each { |t| load t }
 
-task :default => [:spec, :features]
+task :default => [:test]
+
+task :help do
+  print <<EOS
+Examples:
+  run a specific test script
+  > rake test TEST=testname_test.rb
+  run a specific test
+  > rake test TESTOPTS=--name=test_mytest1
+  run tests with --verbose
+  > rake test TESTOPTS=--verbose
+  run stress tests
+  > rake test FLARE_TOOLS_STRESS_TEST=yes
+EOS
+end
 
 task :manual do
   h = RDoc::Markup::ToAnsi.new
@@ -39,25 +38,23 @@ task :manual do
   puts h.convert(rdoc)
 end
 
-task :test do
-  sh "(cd test && rake)"
+Rake::TestTask.new do |test|
+  test.libs << './lib'
+  test.test_files = Dir['test/unit/**/*_test.rb', 'test/integration/**/*_test.rb', 'test/system/**/*_test.rb']
+  test.verbose = true
+  test.ruby_opts = ['-r', 'rubygems']
 end
 
-task :stress_test do
-  sh "(cd test && rake stress)"
-end
+task :test => :work
 
-task :clean do
-  sh "(cd test && rake clean)"
-end
+directory "work"
 
-task :manifest_post do
-  sh "grep -ve '^debian' Manifest.txt| grep -ve '^test' | grep -ve '^package' | grep -ve '^Makefile' | grep -v '#\$' > Manifest.tmp"
-  sh "mv Manifest.tmp Manifest.txt"
+task :clean do
+ sh "rm -rf test/work/test*"
+ sh "rm -f test/*~"
+ sh "rm -f /tmp/flare[id].*.conf"
 end
 
-task :install => [:manifest, :manifest_post, :install_gem]
-
 task :debuild do |t|
   sh "debuild -us -uc"
 end
@@ -84,6 +81,11 @@ task :change do
   sh "git-dch --debian-branch='#{debian_branch}' --new-version #{version} --since=#{since}"
 end
 
+task :killall do
+ sh "pkill /usr/local/bin/flarei"
+ sh "pkill /usr/local/bin/flared"
+end
+
 task :cleanall => [:clean] do
 end
 

data/flare-tools.gemspec

@@ -0,0 +1,26 @@
+# coding: utf-8
+lib = File.dirname(__FILE__) + '/lib'
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'flare/tools'
+
+Gem::Specification.new do |spec|
+  spec.name          = "flare-tools"
+  spec.version       = Flare::Tools::VERSION
+  spec.authors       = ["kikehara", "Yuya YAGUCHI"]
+  spec.email         = ["kiyoshi.ikehara@gree.net", "yuya.yaguchi@gree.net"]
+  spec.summary       = "Management Tools for Flare"
+  spec.description   = "Flare-tools is a collection of tools for Flare distributed key-value store."
+  spec.homepage      = "http://github.com/gree/flare-tools"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'log4r', '>= 1.1.10'
+  spec.add_dependency 'tokyocabinet', '>= 1.29'
+
+  spec.add_development_dependency "bundler", ">= 1.6"
+  spec.add_development_dependency "rake"
+end

data/lib/flare/entity/server.rb

@@ -0,0 +1,4 @@
+module Flare; end
+module Flare::Entity; end
+class Flare::Entity::Server < Struct.new(:host, :port)
+end

data/lib/flare/tools.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8; -*-
 # Authors::   Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>
-# Copyright:: Copyright (C) GREE, Inc. 2011.
+# Copyright:: Copyright (C) GREE, Inc. 2011-2014.
 # License::   MIT-style
 
 # 
@@ -9,8 +9,8 @@ module Flare
   # flare-tools module.
   module Tools
     # the version number of flare-tools
-    VERSION = '0.4.5.1'
-    TITLE = "Flare-tools version #{VERSION} Copyright (C) GREE, Inc. 2011"
+    VERSION = '0.5.0'
+    TITLE = "Flare-tools version #{VERSION} Copyright (C) GREE, Inc. 2011-2014"
     autoload :Common,      'flare/tools/common'
     autoload :Cluster,     'flare/tools/cluster'
     autoload :Stats,       'flare/tools/stats'

data/lib/flare/tools/cli.rb

@@ -25,6 +25,7 @@ module Flare
       autoload :Verify,      'flare/tools/cli/verify'
       autoload :Restore,     'flare/tools/cli/restore'
       autoload :Summary,     'flare/tools/cli/summary'
+      autoload :Part,        'flare/tools/cli/part'
     end
   end
 end

data/lib/flare/tools/cli/activate.rb

@@ -11,23 +11,28 @@ require 'flare/tools/cluster'
 require 'flare/util/conversion'
 require 'flare/util/constant'
 require 'flare/tools/cli/sub_command'
+require 'flare/tools/cli/index_server_config'
 
 module Flare
   module Tools
     module Cli
-      
+
       class Activate < SubCommand
         include Flare::Util::Conversion
         include Flare::Util::Constant
         include Flare::Util::Logging
         include Flare::Tools::Common
-        
+        include Flare::Tools::Cli::IndexServerConfig
+
         myname :activate
         desc   "activate "
         usage  "activate [hostname:port] ..."
-        
-        def setup(opt)
-          opt.on('--force',            "commit changes without confirmation") {@force = true}
+
+        def setup
+          super
+          set_option_index_server
+          set_option_dry_run
+          set_option_force
         end
 
         def initialize
@@ -35,7 +40,8 @@ module Flare
           @force = false
         end
 
-        def execute(config, *args)
+        def execute(config, args)
+          parse_index_server(config, args)
           return S_NG if args.size < 1
 
           hosts = args.map {|x| x.split(':')}
@@ -45,15 +51,15 @@ module Flare
               return S_NG
             end
           end
-          
-          Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], config[:timeout]) do |s|
+
+          Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], @timeout) do |s|
             cluster = Flare::Tools::Cluster.new(s.host, s.port, s.stats_nodes)
             nodes = s.stats_nodes.sort_by{|key, val| [val['partition'], val['role'], key]}
-          
+
             hosts.each do |hostname,port|
               nodekey = nodekey_of hostname, port
               ipaddr = address_of_hostname(hostname)
-          
+
               unless cluster.has_nodekey? nodekey
                 error "invalid 'hostname:port' pair: #{nodekey}"
                 return S_NG
@@ -71,7 +77,7 @@ module Flare
                   (gets.chomp.upcase == "Y")
                 }
               end
-              if exec && !config[:dry_run]
+              if exec && !@dry_run
                 if @force
                   begin
                     s.set_state(hostname, port, 'active')
@@ -96,10 +102,10 @@ module Flare
 
             STDOUT.puts string_of_nodelist(s.stats_nodes, hosts.map {|x| "#{x[0]}:#{x[1]}"})
           end
-          
+
           S_OK
         end # execute()
-        
+
       end
     end
   end

data/lib/flare/tools/cli/balance.rb

@@ -9,6 +9,7 @@ require 'flare/tools/common'
 require 'flare/util/conversion'
 require 'flare/util/constant'
 require 'flare/tools/cli/sub_command'
+require 'flare/tools/cli/index_server_config'
 
 module Flare
   module Tools
@@ -17,20 +18,26 @@ module Flare
         include Flare::Util::Conversion
         include Flare::Util::Constant
         include Flare::Tools::Common
+        include Flare::Tools::Cli::IndexServerConfig
 
         myname :balance
         desc   "set the balance values of nodes."
         usage  "balance [hostname:port:balance] ..."
 
-        def setup(opt)
-          opt.on('--force',            "commit changes without confirmation") {@force = true}
+        def setup
+          super
+          set_option_index_server
+          set_option_dry_run
+          set_option_force
         end
 
         def initialize
+          super
           @force = false
         end
-  
-        def execute(config, *args)
+
+        def execute(config, args)
+          parse_index_server(config, args)
           return S_NG if args.empty?
 
           hosts = args.map {|x| x.to_s.split(':')}
@@ -40,15 +47,15 @@ module Flare
               return S_NG
             end
           end
-          
-          Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], config[:timeout]) do |s|
+
+          Flare::Tools::IndexServer.open(config[:index_server_hostname], config[:index_server_port], @timeout) do |s|
             cluster = Flare::Tools::Cluster.new(s.host, s.port, s.stats_nodes)
 
             hosts.each do |hostname,port,balance|
               balance = balance.to_i
               nodekey = nodekey_of hostname, port
               ipaddr = address_of_hostname(hostname)
-          
+
               unless cluster.has_nodekey? nodekey
                 error "unknown host: #{nodekey}"
                 return S_NG
@@ -68,7 +75,7 @@ module Flare
                 end
               end
               if exec
-                s.set_role(hostname, port.to_i, node['role'], balance, node['partition']) unless config[:dry_run]
+                s.set_role(hostname, port.to_i, node['role'], balance, node['partition']) unless @dry_run
               end
             end
             STDOUT.puts string_of_nodelist(s.stats_nodes, hosts.map {|x| "#{x[0]}:#{x[1]}"})