Merge pull request #24 from daichirata/sfc-gh-cxu-no-recurse

Change recursion to loop in generate_path

.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/

lib/fluent/plugin/out_gcs.rb

@@ -15,6 +15,7 @@ class GCSOutput < Output
     def initialize
       super
       require "google/cloud/storage"
+      Google::Apis.logger = log
     end
 
     config_param :project, :string,  default: nil,
@@ -159,7 +160,7 @@ def check_object_exists(path)
       end
     end
 
-    def generate_path(chunk, i = 0, prev = nil)
+    def generate_path(chunk)
       metadata = chunk.metadata
       time_slice = if metadata.timekey.nil?
                      ''.freeze
@@ -170,23 +171,34 @@ def generate_path(chunk, i = 0, prev = nil)
         "%{file_extension}" => @object_creator.file_extension,
         "%{hex_random}" => hex_random(chunk),
         "%{hostname}" => Socket.gethostname,
-        "%{index}" => i,
         "%{path}" => @path,
         "%{time_slice}" => time_slice,
-        "%{uuid_flush}" => SecureRandom.uuid,
       }
-      path = @object_key_format.gsub(Regexp.union(tags.keys), tags)
-      path = extract_placeholders(path, chunk)
-      return path unless check_object_exists(path)
-
-      if path == prev
-        if @overwrite
-          log.warn "object `#{path}` already exists but overwrites it"
-          return path
+
+      prev = nil
+      i = 0
+
+      until i < 0 do # Until overflow
+        tags["%{uuid_flush}"] = SecureRandom.uuid
+        tags["%{index}"] = i
+
+        path = @object_key_format.gsub(Regexp.union(tags.keys), tags)
+        path = extract_placeholders(path, chunk)
+        return path unless check_object_exists(path)
+
+        if path == prev
+          if @overwrite
+            log.warn "object `#{path}` already exists but overwrites it"
+            return path
+          end
+          raise "object `#{path}` already exists"
         end
-        raise "object `#{path}` already exists"
+
+        i += 1
+        prev = path
       end
-      generate_path(chunk, i + 1, path)
+
+      raise "cannot find an unoccupied GCS path"
     end
 
     # This is stolen from Fluentd

test/plugin/test_out_gcs.rb

@@ -19,6 +19,9 @@ def setup
       @type memory
       timekey_use_utc true
     </buffer>
+    <system>
+      log_level debug
+    </system>
   EOC
 
   def create_driver(conf = CONFIG)