galerab 0.0.2 → 0.0.3

data/bin/galerab

@@ -16,44 +16,42 @@ end
 
 
 puts "[#{Process.pid}] galerab starting with config file at #{ARGV[1]}"
+configuration = Configuration.new(path)
+conf = configuration.conf
+backend = Backend.new(conf)
 
-confs = Configuration.new(path).conf
+balancer = fork { BalancingProxy::Server.run(backend) }
 
-confs.each do |conf|
-  backend = Backend.new(conf[1])
-  conf = conf[1]
-  
-  fork do
-    t = Thread.new do
-      while true
-        # Here we check if the backend is ready
-        next_backend = backend.get_next
-        puts "\nChecking if (wsrep_ready == ON) #{next_backend}\n"
-        
-        begin
-          Sequel.connect(
-            "mysql://#{conf["user"]}:#{conf["password"]}@#{next_backend}/#{conf["database"]}"
-          ).fetch("show status like 'wsrep_ready'") do |row|
-            #row[:Value] = "OFF"
-            if row[:Value] == "OFF"
-              puts "#{next_backend} is not ready"
-              backend.not_ready.push(next_backend) unless backend.not_ready.include?(next_backend)
-            elsif row[:Value] == "ON"
-              puts "#{next_backend} is ready"
-              backend.not_ready.delete(next_backend) if backend.not_ready
-            end
+checker = fork do
+  while true
+    # Here we check if the backend is ready
+    next_backend = backend.get_next
+    puts "\nChecking if (wsrep_ready == ON) #{next_backend}\n"
+    
+    if next_backend
+      begin
+        connection = Sequel.connect(
+          "mysql://#{conf["user"]}:#{conf["password"]}@#{next_backend}/#{conf["database"]}"
+        ).fetch("show status like 'wsrep_ready'") do |row|
+
+          if row[:Value] == "OFF"
+            puts "#{next_backend} is not ready"
+            configuration.remove_backend(next_backend)
+            Process.kill(:SIGHUP, balancer)
+          elsif row[:Value] == "ON"
+            puts "#{next_backend} is ready"
+            configuration.add_backend(next_backend)
+            Process.kill(:SIGHUP, balancer)
           end
-        rescue
-          puts "#{next_backend} is not ready"
-          backend.not_ready.push(next_backend) unless backend.not_ready.include?(next_backend)
         end
-
-        sleep conf["check_every"]
+      rescue Exception => msg
+        puts "#{next_backend} is not ready #{msg}"
+        configuration.remove_backend(next_backend)
+        Process.kill(:SIGHUP, balancer)
       end
     end
     
-    t.join
-    BalancingProxy::Server.run(backend)
+    sleep conf["check_every"]
   end
 end
 
@@ -63,5 +61,6 @@ trap (:SIGHUP) do
   $stdout.puts backend.conf["balancer_ports"].inspect
 end
 
-# release child processes before exit
-confs.each { |conf| Process.wait }
+Process.waitpid2(checker)
+Process.waitpid2(balancer)
+#connection = Sequel.connect("mysql://root:root@192.168.2.11/mysql").fetch("show status like 'wsrep_ready'") {puts row[:Value]}

data/files/galerab.yml

@@ -1,17 +1,7 @@
-1:
-  backends: ["localhost"]
-  check_every: 10
-  user: root
-  password: root
-  database: mysql
-  balancer_port: 3307
-  backend_port: 3306
-
-2:
-  backends: ["192.168.1.11"]
-  check_every: 10
-  user: root
-  password: root
-  database: mysql
-  balancer_port: 3308
-  backend_port: 3306
+backends: ["192.168.2.11"]
+check_every: 3
+user: root
+password: root
+database: mysql
+balancer_port: 3308
+backend_port: 3306

data/lib/galerab/configuration.rb

@@ -3,5 +3,16 @@ class Configuration
   
   def initialize(path)
     @conf = YAML.load_file(path)
+    @path = path
+  end
+  
+  def remove_backend(address)
+   @conf['backends'].delete(address)
+   File.open(@path, 'w+') {|f| f.write(@conf.to_yaml) }
+  end
+  
+  def add_backend(address)
+   @conf['backends'] << address unless @conf['backends'].include?(address)
+   File.open(@path, 'w+') {|f| f.write(@conf.to_yaml) }
   end
 end

data/lib/galerab/proxy.rb

@@ -2,15 +2,5 @@ class Proxy
   def self.stop
     puts "Terminating ProxyServer"
     EventMachine.stop
-  end
-  
-  # this is not used
-  def self.kill_childs(servers, signal)
-    servers.each do |server|
-      puts "Killing process #{server[:pid]} with #{signal} signal."
-      Process.kill(signal, server[:pid])
-    end
-
-    Process.kill(signal, Process.pid)
-  end  
+  end 
 end

data/spec/lib/backend_spec.rb

@@ -1,41 +1,9 @@
 require 'spec_helper'
 
-describe Configuration do
-  before(:each) do
-    @conf = Configuration.new(ENV['GALERAB_CONFIG_PATH']).conf
-  end
-  
-  context "when loading the file" do
-    it "should load the YAML file" do
-      @conf.should be_true
-    end
-  
-    it "should find two balancers in the config file" do
-      @conf.size.should be == 2
-    end
-  
-    it "gets the backends for balancer 1" do
-      @conf[1]['backends'].size.should be == 3
-      @conf[1]['backends'][0].should be == "192.168.10.101"
-      @conf[1]['backends'][1].should be == "192.168.10.102"
-      @conf[1]['backends'][2].should be == "192.168.10.103"
-    end
-    
-    it "loads the other parameters" do
-      @conf[1]['check_every'].size.should be == 8
-      @conf[1]['user'].should be == "your_user"
-      @conf[1]['password'].should be == "your_password"
-      @conf[1]['database'].should be == "your_db"
-      @conf[1]['balancer_port'].should be == 3307
-      @conf[1]['backend_port'].should be == 3306
-    end
-  end
-end
-
 describe Backend do
   before(:each) do
-    @conf = Configuration.new(ENV['GALERAB_CONFIG_PATH']).conf.first
-    @backend = Backend.new(@conf[1])
+    @conf = Configuration.new(ENV['GALERAB_CONFIG_PATH'] + '/galerab.yml').conf
+    @backend = Backend.new(@conf)
   end
   
   context "round robin load balancing" do

data/spec/lib/configuration_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
-
 describe Configuration do
   before(:each) do
-    @conf = Configuration.new(ENV['GALERAB_CONFIG_PATH']).conf
+    %x[cp #{ENV['GALERAB_CONFIG_PATH'] + '/galerab.yml.backup'} #{ENV['GALERAB_CONFIG_PATH'] + '/galerab.yml'}]
+    @configuration = Configuration.new(ENV['GALERAB_CONFIG_PATH'] + '/galerab.yml')
+    @conf = @configuration.conf
   end
   
   context "when loading the file" do
@@ -10,24 +10,39 @@ describe Configuration do
       @conf.should be_true
     end
   
-    it "should find two balancers in the config file" do
-      @conf.size.should be == 2
-    end
-  
     it "gets the backends for balancer 1" do
-      @conf[1]['backends'].size.should be == 3
-      @conf[1]['backends'][0].should be == "192.168.10.101"
-      @conf[1]['backends'][1].should be == "192.168.10.102"
-      @conf[1]['backends'][2].should be == "192.168.10.103"
+      @conf['backends'].size.should be == 3
+      @conf['backends'][0].should be == "192.168.10.101"
+      @conf['backends'][1].should be == "192.168.10.102"
+      @conf['backends'][2].should be == "192.168.10.103"
     end
     
     it "loads the other parameters" do
-      @conf[1]['check_every'].size.should be == 8
-      @conf[1]['user'].should be == "your_user"
-      @conf[1]['password'].should be == "your_password"
-      @conf[1]['database'].should be == "your_db"
-      @conf[1]['balancer_port'].should be == 3307
-      @conf[1]['backend_port'].should be == 3306
+      @conf['check_every'].size.should be == 8
+      @conf['user'].should be == "your_user"
+      @conf['password'].should be == "your_password"
+      @conf['database'].should be == "your_db"
+      @conf['balancer_port'].should be == 3307
+      @conf['backend_port'].should be == 3306
     end
   end
-end
+  
+  it "should remove a backend from the config file" do
+    @configuration.remove_backend("192.168.10.103")
+    @conf = @configuration.conf
+    @conf['backends'].should_not include("192.168.10.103")
+  end
+  
+  it "should add a backend to the config file" do
+    @configuration.remove_backend("192.168.10.103") # make sure there is not that address
+    @configuration.add_backend("192.168.10.103")
+    @conf = @configuration.conf
+    @conf['backends'].should include("192.168.10.103")
+  end
+  
+  it "should not add another backend if it is already in the list" do
+    @conf['backends'].size.should be == 3
+    @configuration.add_backend("192.168.10.103")
+    @conf['backends'].size.should be == 3
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rspec'
-ENV['GALERAB_CONFIG_PATH'] = File.dirname(__FILE__) + '/galerab.yml'
+ENV['GALERAB_CONFIG_PATH'] = File.dirname(__FILE__)
 require 'galerab'
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: galerab
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: