logstash-input-azureblob 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d707b40498cf41aff368f405137d3997abf0e3
-  data.tar.gz: 933fb461fa056eef0f8122a91eabc899781d9ac4
+  metadata.gz: b7d6623db4c54c7b7738b62fba3cc60d2d8a8025
+  data.tar.gz: 3276b15d9a23eeb1fd3f8fb5a8f0d5be0a88d2cd
 SHA512:
-  metadata.gz: e21058e38226798a4b2ff8089e6e84a80fba966b1e2909c02a9f6bb109120426e7bbb7d377a876f393421c05b4f81fb92a62b8f6d82f890e8d90fe6e5695dff4
-  data.tar.gz: e63cf4d75d6310ebf8964d52ba546eb4a0bd325510e40af990862e327d16bfb2618c1a238c70fbc3f4227c222d0d19da79146abbdb9f84218226560716318a2b
+  metadata.gz: e84d868cbce5d306e8a116caee3614a848d799071a2f3f61b5d7299f0d31ad98164a4f05bed417cb1e4465878ec4cbafd719e8e143d7d7c174402859cc424607
+  data.tar.gz: eb7c30b0211e37a44df530c2ae2464a742acb804656ade6d0c6de5b3b4187d7d72946cdc1c2debe9531cc9f01cddde0b4bcd058c5aeb3585d8e0071b459b9619

data/lib/logstash/inputs/azureblob.rb

@@ -277,7 +277,7 @@ end #def get_jsons!
     @blob_list_page_size = 100 if @blob_list_page_size <= 0
     loop do
       # Need to limit the returned number of the returned entries to avoid out of memory exception.
-      entries = @azure_blob.list_blobs(@container, { :timeout => 10, :marker => continuation_token, :max_results => @blob_list_page_size })
+      entries = @azure_blob.list_blobs(@container, { :timeout => 60, :marker => continuation_token, :max_results => @blob_list_page_size })
       entries.each do |entry|
         blobs << entry
       end # each
@@ -312,20 +312,24 @@ end #def get_jsons!
 
   # Acquire a lease on a blob item with retries.
   #
-  # By default, it will retry 30 times with 1 second interval.
-  def acquire_lease(blob_name, retry_times = 30, interval_sec = 1)
+  # By default, it will retry 60 times with 1 second interval.
+  def acquire_lease(blob_name, retry_times = 60, interval_sec = 1)
     lease = nil;
     retried = 0;
     while lease.nil? do
       begin
-        lease = @azure_blob.acquire_blob_lease(@container, blob_name, { :timeout => 10, :duration => @registry_lease_duration })
+        lease = @azure_blob.acquire_blob_lease(@container, blob_name, { :timeout => 60, :duration => @registry_lease_duration })
       rescue StandardError => e
-        if(e.type == 'LeaseAlreadyPresent')
-            if (retried > retry_times)
-                raise
-            end
-            retried += 1
-            sleep interval_sec
+        if(e.type && e.type == 'LeaseAlreadyPresent')
+          if (retried > retry_times)
+            raise
+          end
+          retried += 1
+          sleep interval_sec
+        else
+          # Anything else happend other than 'LeaseAlreadyPresent', break the lease. This is a work-around for the behavior that when
+          # timeout exception is hit, somehow, a infinite lease will be put on the lock file.
+          @azure_blob.break_blob_lease(@container, blob, { :break_period => 30 })
         end
       end
     end #while

data/logstash-input-azureblob.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-azureblob'
-  s.version       = '0.9.10'
+  s.version       = '0.9.11'
   s.licenses      = ['Apache License (2.0)']
   s.summary       = 'This plugin collects Microsoft Azure Diagnostics data from Azure Storage Blobs.'
   s.description   = 'This gem is a Logstash plugin. It reads and parses data from Azure Storage Blobs.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-azureblob
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement