cuboid 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c89df73b039d72a4e7ba39d3bd4061ccb6a7725db1283499a7f0f267b2b871b2
-  data.tar.gz: c9e8eb873600484f75d0ef20acb7e97bdf77275dc494c204fd6acea1c0164cce
+  metadata.gz: 1c60a30f1e751d2c66d99373ad8f928e0ba903ee49cfc2d3af4f9913cf77e35e
+  data.tar.gz: 39fb0c5585c7f164df0fbbf378aebd8347a9f6037cc5e68f0cc3cf24166f277e
 SHA512:
-  metadata.gz: 25a3cb88bc17702e1f6a1f5fd7a53ef3505a61100978449cf19430434ca03ea050b774c798b097b2d4506a825953d86b7ed1fe121324202dc580594a0701ae35
-  data.tar.gz: 7492bd6c97cffaff9657584a2c960f62af6f83ef960fbbf6115a8e40ff95acd79833bc9f0a9b8ab8e657952c05cb6ae132f032a3a7bd256a90880c5f5266791b
+  metadata.gz: 978048c874d5735f231adecf85777d9a091709203616bc30ca37d58d98a0e93e42ccf4d8d88d1454367118a09b94ac249cf79fccc37027ba280e4f097fde7e73
+  data.tar.gz: a2304bb473bce181b003a0d173ac6920ad1dbb8b03eb695befff39eb0d559c4a1cb3b057dfd19b10093396d23b7a7f20f4eccfa9ba549eacb1dc37f977719e22

data/lib/cuboid/rest/server/routes/instances.rb

@@ -32,6 +32,23 @@ module Instances
             json id: instance.token
         end
 
+        app.post '/instances/restore' do
+            max_utilization! if !agent && System.max_utilization?
+
+            options = ::JSON.load( request.body.read ) || {}
+
+            instance = get_instance
+            max_utilization! if !instance
+
+            handle_error proc { instance.shutdown } do
+                instance.restore!( options['session'] )
+            end
+
+            instances[instance.token] = instance
+
+            json id: instance.token
+        end
+
         # Progress
         app.get '/instances/:instance' do
             ensure_instance!
@@ -106,6 +123,14 @@ module Instances
             end
         end
 
+        app.put '/instances/:instance/abort' do
+            ensure_instance!
+
+            instance_for( params[:instance] ) do |instance|
+                json instance.abort!
+            end
+        end
+
         # Abort/shutdown
         app.delete '/instances/:instance' do
             ensure_instance!

data/lib/cuboid/rpc/server/application_wrapper.rb

@@ -44,7 +44,7 @@ class ApplicationWrapper
     #   `true` If the system is scanning, `false` if {#run} hasn't been called
     #   yet or if the scan has finished.
     def busy?
-        ![:ready, :done, :suspended].include?( @application.status ) &&
+        ![:ready, :done, :suspended, :aborted].include?( @application.status ) &&
           !!@extended_running
     end
 
@@ -58,6 +58,7 @@ class ApplicationWrapper
         # Start the scan  -- we can't block the RPC server so we're using a Thread.
         Thread.new do
             @application.run
+            @extended_running = false
         end
 
         true
@@ -66,10 +67,10 @@ class ApplicationWrapper
     def clean_up
         return false if @rpc_cleaned_up
 
+        @application.clean_up
+
         @rpc_cleaned_up   = true
         @extended_running = false
-
-        @application.clean_up
     end
 
     # @param    [Integer]   starting_line
@@ -109,7 +110,7 @@ class ApplicationWrapper
 
         data = {
             status:         status,
-            busy:           running?,
+            busy:           @extended_running,
             application:    @application.class.to_s,
             seed:           Utilities.random_seed,
             agent_url: Cuboid::Options.agent.url,

data/lib/cuboid/rpc/server/instance.rb

@@ -103,8 +103,15 @@ class Instance
     # @see #suspend
     # @see #snapshot_path
     def restore!( snapshot )
+        # If the instance isn't clean bail out now.
+        return false if busy? || @called
+
+        @called = @run_initializing = true
+
         Thread.new do
-            @application.restore!( snapshot ).run
+            @application.restore!( snapshot )
+            @application.run
+            @run_initializing = false
         end
 
         true

data/lib/cuboid/state/application.rb

@@ -140,6 +140,7 @@ class Application
     def aborted
         @abort = false
         @status = :aborted
+        @running = false
         nil
     end
 

data/lib/version

@@ -1 +1 @@
-0.2.11
+0.2.12

data/spec/cuboid/rest/server_spec.rb

@@ -251,6 +251,26 @@ describe Cuboid::Rest::Server do
         end
     end
 
+    describe 'POST /instances/restore' do
+        let(:tpl_url) { '/instances/restore' }
+
+        it 'creates an instance from a restores session'
+
+        context 'when given invalid options' do
+            it 'returns a 500'
+
+            it 'does not list the instance on the index'
+        end
+
+        context 'when the system is at max utilization' do
+            it 'returns a 503'
+        end
+
+        context 'when a Agent has been set' do
+            it 'uses it'
+        end
+    end
+
     describe 'GET /instances/:instance' do
         let(:tpl_url) { '/instances/%s' }
 
@@ -567,7 +587,59 @@ describe Cuboid::Rest::Server do
             end
         end
     end
-    
+
+    describe 'PUT /instances/:instance/abort' do
+        let(:tpl_url) { '/instances/%s/abort' }
+
+        before do
+            @id = create_instance
+        end
+
+        it 'aborts the instance' do
+            put url
+            expect(response_code).to eq 200
+
+            get "/instances/#{id}"
+            expect(['aborting', 'aborted']).to include response_data['status']
+        end
+
+        context 'when passed a non-existent id' do
+            let(:id) { non_existent_id }
+
+            it 'returns 404' do
+                put url
+                expect(response_code).to eq 404
+            end
+        end
+
+        context 'when the instance is from the Scheduler' do
+            before do
+                put '/scheduler/url', scheduler.url
+            end
+
+            it 'includes it' do
+                @id = scheduler.push( options )
+                sleep 0.1 while scheduler.running.empty?
+
+                put url
+                expect(response_code).to eq 200
+
+                get "/instances/#{id}"
+                expect(['aborting', 'aborted']).to include response_data['status']
+            end
+
+            context 'when the instance completes' do
+                it 'is removed' do
+                    @id = scheduler.push( options )
+                    sleep 0.1 while scheduler.completed.empty?
+
+                    put url
+                    expect(response_code).to be 404
+                end
+            end
+        end
+    end
+
     describe 'DELETE /instances/:instance' do
         let(:tpl_url) { '/instances/%s' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuboid
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Tasos Laskos
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2025-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print