deb-s3-lock-fix 0.11.8.fix0.1 → 0.11.8.fix0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b7c555d0e33412b90fb17d46b473f97d414e504e96ced3726e5cdbaa0c80c58
-  data.tar.gz: ed1697addac22433d6830beef8a84cf7a03c85a160004729fc75fb66a210f162
+  metadata.gz: 96bae859e8570813b3ca71a774182b49e1b710ba753c4e2b248b29316ae31523
+  data.tar.gz: 4e8dc1299ae006258ed0745dda5f9804c7ff0215fa26a405d27c136ae05896c5
 SHA512:
-  metadata.gz: 2ad9c7570206b4f39b777667e24e3f004f816b946a55048bcf8b8f84ad24f4cccb7e81a034d25dd5996f47e9ccc351f966338df37f45a838e073688bde56434c
-  data.tar.gz: 1fce1fe773fb1397f81bc513b32d3e9f7b39398bf1a0e2e7dd8183a6f9876131ef919cb9353361be9e791fdbb7d3edb9dc336bd04e05a680c1799ec968b3a5f6
+  metadata.gz: 45c9aabade8123c3d499ece078b56e2e2eaf3b501d5c0229254d872f16008af36894d7664ec8258fa33e9031cfcbcdda1348db55302c3d6f327d5d90cc92268d
+  data.tar.gz: 624c33b41c7c0710ded488dd97ee23b7d938444de922b20bd25a8c7b6453500fe6bc8c3996d772294030bdf1bba8d36f24d7f71225578402646c6ad16a5db15a

data/lib/deb/s3/cli.rb

@@ -165,7 +165,7 @@ class Deb::S3::CLI < Thor
       if options[:lock]
         log("Checking for existing lock file")
         log("Locking repository for updates")
-        Deb::S3::Lock.lock(options[:codename])
+        Deb::S3::Lock.lock(options[:bucket], options[:codename])
         @lock_acquired = true
       end
 
@@ -257,7 +257,7 @@ class Deb::S3::CLI < Thor
       log("Update complete.")
     ensure
       if options[:lock] && @lock_acquired
-        Deb::S3::Lock.unlock(options[:codename])
+        Deb::S3::Lock.unlock(options[:bucket], options[:codename])
         log("Lock released.")
       end
     end
@@ -406,7 +406,7 @@ class Deb::S3::CLI < Thor
       if options[:lock]
         log("Checking for existing lock file")
         log("Locking repository for updates")
-        Deb::S3::Lock.lock(options[:codename])
+        Deb::S3::Lock.lock(options[:bucket], options[:codename])
         @lock_acquired = true
       end
 
@@ -448,7 +448,7 @@ class Deb::S3::CLI < Thor
       log "Copy complete."
     ensure
       if options[:lock] && @lock_acquired
-        Deb::S3::Lock.unlock(options[:codename])
+        Deb::S3::Lock.unlock(options[:bucket], options[:codename])
         log("Lock released.")
       end
     end
@@ -501,7 +501,7 @@ class Deb::S3::CLI < Thor
       if options[:lock]
         log("Checking for existing lock file")
         log("Locking repository for updates")
-        Deb::S3::Lock.lock(options[:codename])
+        Deb::S3::Lock.lock(options[:bucket], options[:codename])
         @lock_acquired = true
       end
 
@@ -549,7 +549,7 @@ class Deb::S3::CLI < Thor
       end
     ensure
       if options[:lock] && @lock_acquired
-        Deb::S3::Lock.unlock(options[:codename])
+        Deb::S3::Lock.unlock(options[:bucket], options[:codename])
         log("Lock released.")
       end
     end
@@ -615,7 +615,7 @@ class Deb::S3::CLI < Thor
       if options[:lock]
         log("Checking for existing lock file")
         log("Locking repository for updates")
-        Deb::S3::Lock.lock(options[:codename])
+        Deb::S3::Lock.lock(options[:bucket], options[:codename])
         @lock_acquired = true
       end
 
@@ -679,7 +679,7 @@ class Deb::S3::CLI < Thor
       end
     ensure
       if options[:lock] && @lock_acquired
-        Deb::S3::Lock.unlock(options[:codename])
+        Deb::S3::Lock.unlock(options[:bucket], options[:codename])
         log("Lock released.")
       end
     end

data/lib/deb/s3/lock.rb

@@ -25,20 +25,21 @@ class Deb::S3::Lock
   end
 
   def self.validate_environment_variables!
-    %w[DEB_S3_LOCK_ACCESS_KEY_ID DEB_S3_LOCK_SECRET_ACCESS_KEY AWS_BUILDERS_REGION].each do |var|
+    %w[DEB_S3_ACCESS_KEY_ID DEB_S3_SECRET_ACCESS_KEY AWS_BUILDERS_REGION].each do |var|
       raise "Environment variable #{var} not set." unless ENV[var]
     end
   end
 
   class << self
-    def lock(codename, max_attempts = 60, max_wait_interval = 10)
+    def lock(bucket, codename, max_attempts = 60, max_wait_interval = 10)
       uuid = SecureRandom.uuid
       lock_body = "#{Etc.getlogin}@#{Socket.gethostname}-#{uuid}"
-      lock_key = codename
+      lock_key = "#{bucket}/#{codename}"
 
       $stderr.puts("Current job's hostname with UUID: #{lock_body}")
 
       max_attempts.times do |i|
+        delete_expired_lock(bucket, codename)
         wait_interval = [2**i, max_wait_interval].min
 
         expiration_time = Time.now.to_i + 45
@@ -54,7 +55,7 @@ class Deb::S3::Lock
           })
           return
         rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException
-          lock_holder = current_lock_holder(codename)
+          lock_holder = current_lock_holder(bucket, codename)
           current_time = Time.now.strftime("%Y-%m-%d %H:%M:%S")
           $stderr.puts("[#{current_time}] Repository is locked by another user: #{lock_holder.user} at host #{lock_holder.host_with_uuid}")
           $stderr.puts("Attempting to obtain a lock after #{wait_interval} second(s).")
@@ -65,20 +66,20 @@ class Deb::S3::Lock
       raise "Unable to obtain a lock after #{max_attempts} attemtps, giving up."
     end
 
-    def unlock(codename)
+    def unlock(bucket, codename)
       # dynamodb.delete_item({
       #   table_name: DYNAMODB_TABLE_NAME,
       #   key: {
-      #     'lock_key' => codename
+      #     'lock_key' => "#{bucket}/#{codename}"
       #   }
       # })
     end
 
-    def current_lock_holder(codename)
+    def current_lock_holder(bucket, codename)
       response = dynamodb.get_item({
         table_name: DYNAMODB_TABLE_NAME,
         key: {
-          'lock_key' => codename
+          'lock_key' => "#{bucket}/#{codename}"
         }
       })
 
@@ -91,6 +92,45 @@ class Deb::S3::Lock
       end
     end
 
+    def delete_expired_lock(bucket, codename)
+      response = dynamodb.get_item({
+        table_name: DYNAMODB_TABLE_NAME,
+        key: {
+          'lock_key' => "#{bucket}/#{codename}"
+        }
+      })
+      
+      return unless response.item
+      
+      if response.item['ttl'] && Time.now.to_i > response.item['ttl'].to_i
+        lockdata = response.item['lock_body']
+        user, _ = lockdata.split("@", 2)
+        
+        delete_response = nil
+    
+        begin
+          delete_response = dynamodb.delete_item({
+            table_name: DYNAMODB_TABLE_NAME,
+            key: {
+              'lock_key' => "#{bucket}/#{codename}"
+            },
+            return_values: 'ALL_OLD'
+          })
+        rescue Aws::DynamoDB::Errors::ServiceError => e
+          $stderr.puts("Error deleting lock: #{e.message}")
+          return
+        end
+    
+        if delete_response.attributes
+          current_time = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          $stderr.puts("[#{current_time}] Expired lock detected and deleted for #{bucket}/#{codename}. Lock was held by user: #{user}.")
+        end
+      end
+    end
+    
+    
+       
+
     private :dynamodb, :validate_environment_variables!
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3-lock-fix
 version: !ruby/object:Gem::Version
-  version: 0.11.8.fix0.1
+  version: 0.11.8.fix0.3
 platform: ruby
 authors:
 - Braeden Wolf & Ken Robertson
@@ -80,9 +80,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11'
-description: Fork of deb-s3 with a specific fix for locking. Original work by Ken
-  Robertson.
-email: braedenwolf@outlook.com & ken@invalidlogic.com
+description: Fork of deb-s3 with fix for locking. Original work by Ken Robertson.
+email: braeden.wolf@sanctuary.ai & ken@invalidlogic.com
 executables:
 - deb-s3
 extensions: []
@@ -99,7 +98,7 @@ files:
 - lib/deb/s3/templates/package.erb
 - lib/deb/s3/templates/release.erb
 - lib/deb/s3/utils.rb
-homepage: https://github.com/braedenwolf/deb-s3-lock-fix
+homepage: https://gitlab.com/sanctuaryai/precog2/infrastructure/deb-s3-lock-fix
 licenses:
 - MIT
 metadata: {}
@@ -121,5 +120,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Easily create and manage an APT repository on S3 (with specific lock fix).
+summary: Easily create and manage an APT repository on S3 with lock fix.
 test_files: []