influxdb 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 340e103295b0398a309d3e05e64da660e9fc220e
-  data.tar.gz: 794b43a718b6a3d0a4cd9779a428958d228b400f
+  metadata.gz: 760707db17ad8199b2159d6e1e0f28e420f60f2f
+  data.tar.gz: 1fb214ed28fe1978c7fc7a0b4a1aa9b2d6572988
 SHA512:
-  metadata.gz: 9b2e87b5273b7b7d593ae48a0d90d375a2bb16a5c6f3ea207b163082fbb8ce8b4441b821f3238fedd1963b351003d455e0d06db2a767f8f19144234b351193b9
-  data.tar.gz: 6441b368ba226e0ff02dbc064a8ff8ba38f1a3de473e2329959d7bd4ee45a02bbfb88443dcdc4d5da2463e791bef77ba77a40db10a29ddd0c2f3dfefbdfdc14b
+  metadata.gz: 7348efe2e8cf889cfcb6f4fa5557eb217438abb7c87a43813b3da1290412107f7b73f0959cd7a590172ed0158ef9663716c3ac1de733dcb6e26038e90ddbacfd
+  data.tar.gz: 4fbceddc8faa2e02bc7ef272c17c63d4fc81f73c9f964f51003cbd96769786d84d07369d52617737c5618f15a66fa67eaf55aaf9cbf76beb54ec8921a4373935

data/README.md

@@ -106,7 +106,7 @@ name     = 'foobar'
 time_precision = 's'
 
 influxdb = InfluxDB::Client.new database, :username => username,
-                                          :password => password, 
+                                          :password => password,
                                           :time_precision => time_precision
 
 data = {
@@ -215,6 +215,41 @@ influxdb.query 'select * from time_series_1' do |name, points|
 end
 ```
 
+By default, an InfluxDB::Client will keep trying to connect to the database when
+it gets connection denied, if you want to retry a finite number of times
+(or disable retries altogether), you should pass the `:retry`
+value. `:retry` can be either `true`, `false` or an `Integer` to retry
+infinite times, disable retries or retry a finite number of times,
+respectively. `0` is equivalent to `false`
+
+```
+> require 'influxdb'
+=> true
+
+> influxdb = InfluxDB::Client.new 'database', :retry => 4
+=> #<InfluxDB::Client:0x00000002bb5ce0 @database="database", @hosts=["localhost"],
+@port=8086, @username="root", @password="root", @use_ssl=false,
+@time_precision="s", @initial_delay=0.01, @max_delay=30,
+@open_timeout=5, @read_timeout=300, @async=false, @retry=4>
+
+> influxdb.query 'select * from serie limit 1'
+E, [2014-06-02T11:04:13.416209 #22825] ERROR -- : [InfluxDB] Failed to
+contact host localhost: #<SocketError: getaddrinfo: Name or service not known> -
+retrying in 0.01s.
+E, [2014-06-02T11:04:13.433646 #22825] ERROR -- : [InfluxDB] Failed to
+contact host localhost: #<SocketError: getaddrinfo: Name or service not known> -
+retrying in 0.02s.
+E, [2014-06-02T11:04:13.462566 #22825] ERROR -- : [InfluxDB] Failed to
+contact host localhost: #<SocketError: getaddrinfo: Name or service not known> -
+retrying in 0.04s.
+E, [2014-06-02T11:04:13.510853 #22825] ERROR -- : [InfluxDB] Failed to
+contact host localhost: #<SocketError: getaddrinfo: Name or service not known> -
+retrying in 0.08s.
+SocketError: Tried 4 times to reconnect but failed.
+
+```
+If you pass `:retry => -1` it will keep trying forever
+until it gets the connection.
 
 Testing
 -------

data/Rakefile

@@ -11,7 +11,7 @@ RSpec::Core::RakeTask.new(:spec) do |t|
 end
 
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.color = true
   config.formatter = :documentation
 end
 

data/lib/influxdb/client.rb

@@ -54,7 +54,15 @@ module InfluxDB
       @open_timeout = opts[:write_timeout] || 5
       @read_timeout = opts[:read_timeout] || 300
       @async = opts[:async] || false
-      @retry = opts.fetch(:retry) { true }
+      @retry = opts.fetch(:retry, nil)
+      @retry = case @retry
+      when Integer
+        @retry
+      when true, nil
+        -1
+      when false
+        0
+      end
 
       @worker = InfluxDB::Worker.new(self) if @async
 
@@ -129,6 +137,15 @@ module InfluxDB
       get full_url("/db/#{database}/continuous_queries")
     end
 
+    def get_shard_list()
+      get full_url("/cluster/shards")
+    end
+
+    def delete_shard(shard_id, server_ids, username, password)
+      data = JSON.generate({"serverIds" => server_ids})
+      delete full_url("/cluster/shards/#{shard_id}", :u => username, :p => password), data
+    end
+
     def write_point(name, data, async=@async, time_precision=@time_precision)
       data = data.is_a?(Array) ? data : [data]
       columns = data.reduce(:merge).keys.sort {|a,b| a.to_s <=> b.to_s}
@@ -169,6 +186,10 @@ module InfluxDB
       end
     end
 
+    def delete_series(series)
+      delete full_url("/db/#{@database}/series/#{series}")
+    end
+
     def stop!
       @stopped = true
     end
@@ -215,9 +236,10 @@ module InfluxDB
       end
     end
 
-    def delete(url)
+    def delete(url, data = nil)
+      headers = {"Content-Type" => "application/json"}
       connect_with_retry do |http|
-        response = http.request(Net::HTTP::Delete.new(url))
+        response = http.request(Net::HTTP::Delete.new(url, headers), data)
         if response.kind_of? Net::HTTPSuccess
           return response
         elsif response.kind_of? Net::HTTPUnauthorized
@@ -231,6 +253,7 @@ module InfluxDB
     def connect_with_retry(&block)
       hosts = @hosts.dup
       delay = @initial_delay
+      retry_count = 0
 
       begin
         hosts.push(host = hosts.shift)
@@ -241,25 +264,21 @@ module InfluxDB
         block.call(http)
 
       rescue Timeout::Error, *InfluxDB::NET_HTTP_EXCEPTIONS => e
-        log :error, "Failed to contact host #{host}: #{e.inspect} #{"- retrying in #{delay}s." if retry?}"
-        log :info, "Queue size is #{@queue.length}." unless @queue.nil?
-        stop! unless retry?
-        if stopped?
-          raise e
-        else
+        retry_count += 1
+        if (@retry == -1 or retry_count <= @retry) and !stopped?
+          log :error, "Failed to contact host #{host}: #{e.inspect} - retrying in #{delay}s."
+          log :info, "Queue size is #{@queue.length}." unless @queue.nil?
           sleep delay
           delay = [@max_delay, delay * 2].min
           retry
+        else
+          raise e, "Tried #{retry_count-1} times to reconnect but failed."
         end
       ensure
         http.finish if http.started?
       end
     end
 
-    def retry?
-      !stopped? && @retry
-    end
-
     def denormalize_series series
       columns = series['columns']
 

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/influxdb/client_spec.rb

@@ -20,7 +20,7 @@ describe InfluxDB::Client do
         @influxdb.port.should == 8086
         @influxdb.username.should == "root"
         @influxdb.password.should == "root"
-        @influxdb.use_ssl.should be_false
+        @influxdb.use_ssl.should be_falsey
         @influxdb.time_precision.should == "s"
       end
     end
@@ -85,7 +85,7 @@ describe InfluxDB::Client do
         @influxdb.port.should == 8086
         @influxdb.username.should == "root"
         @influxdb.password.should == "root"
-        @influxdb.use_ssl.should be_true
+        @influxdb.use_ssl.should be_truthy
       end
     end
 
@@ -243,6 +243,28 @@ describe InfluxDB::Client do
     end
   end
 
+  describe "#get_shard_list" do
+    it "should GET a list of shards" do
+      shard_list = {"longTerm" => [], "shortTerm" => []}
+      stub_request(:get, "http://influxdb.test:9999/cluster/shards").with(
+        :query => {:u => "username", :p => "password"}
+      ).to_return(:body => JSON.generate(shard_list, :status => 200))
+
+      @influxdb.get_shard_list.should == shard_list
+    end
+  end
+
+  describe "#delete_shard" do
+    it "should DELETE a shard by id" do
+      shard_id = 1
+      stub_request(:delete, "http://influxdb.test:9999/cluster/shards/#{shard_id}").with(
+        :query => {:u => "username", :p => "password"}
+      )
+
+      @influxdb.delete_shard(shard_id, [1, 2], "username", "password").should be_a(Net::HTTPOK)
+    end
+  end
+
   describe "#write_point" do
     it "should POST to add points" do
       body = [{
@@ -279,25 +301,46 @@ describe InfluxDB::Client do
         stub_request(:post, "http://influxdb.test:9999/db/database/series").with(
             :query => {:u => "username", :p => "password", :time_precision => "s"},
             :body => body
-        ).to_raise(Timeout::Error).then.to_return(:status => 200)
-      end
-
-      it "retries on http errors when not stopped" do
-        expect(subject).to be_a(Net::HTTPOK)
+        ).to_raise(Timeout::Error)
       end
 
       it "raises when stopped" do
         @influxdb.stop!
+        @influxdb.should_not_receive :sleep
         expect { subject }.to raise_error(Timeout::Error)
       end
 
-      context "when retry disabled" do
-        let(:args) { { :retry => false } }
+      context "when retry is 0" do
+        let(:args) { { :retry => 0 } }
+        it "raise error directly" do
+          @influxdb.should_not_receive :sleep
+          expect { subject }.to raise_error(Timeout::Error)
+        end
+      end
+
+      context "when retry is 'n'" do
+        let(:args) { { :retry => 3 } }
 
-        it "raises" do
+        it "raise error after 'n' attemps" do
+          @influxdb.should_receive(:sleep).exactly(3).times
           expect { subject }.to raise_error(Timeout::Error)
         end
       end
+
+      context "when retry is -1" do
+        let(:args) { { :retry => -1 } }
+        before do
+          stub_request(:post, "http://influxdb.test:9999/db/database/series").with(
+            :query => {:u => "username", :p => "password", :time_precision => "s"},
+            :body => body
+          ).to_raise(Timeout::Error).then.to_raise(Timeout::Error).then.to_raise(Timeout::Error).then.to_raise(Timeout::Error).then.to_return(:status => 200)
+        end
+
+        it "keep trying until get the connection" do
+          @influxdb.should_receive(:sleep).at_least(4).times
+          expect { subject }.to_not raise_error
+        end
+      end
     end
 
     it "raise an exception if the server didn't return 200" do
@@ -491,6 +534,16 @@ describe InfluxDB::Client do
     end
   end
 
+  describe "#delete_series" do
+    it "should DELETE to remove a series" do
+      stub_request(:delete, "http://influxdb.test:9999/db/database/series/foo").with(
+        :query => {:u => "username", :p => "password"}
+      )
+
+      @influxdb.delete_series("foo").should be_a(Net::HTTPOK)
+    end
+  end
+
   describe "#full_url" do
     it "should return String" do
       @influxdb.send(:full_url, "/unknown").should be_a String

data/spec/influxdb/worker_spec.rb

@@ -10,7 +10,7 @@ describe InfluxDB::Worker do
 
     it "should _write to the client" do
       queue = Queue.new
-      expect(fake_client).to receive(:_write).once.with([payload]).and_return do |data|
+      expect(fake_client).to receive(:_write).once.with([payload]) do |data|
         queue.push(:received)
       end
       worker.push(payload)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json