Merge pull request #2257 from oasisprotocol/kostko/fix/rofl-scheduler-multi-accept

rofl-scheduler: Multiple fixes

Author: kostko

rofl-scheduler/rofl.yaml

@@ -1,5 +1,5 @@
 name: rofl-scheduler
-version: 0.2.2
+version: 0.2.3
 repository: https://github.com/oasisprotocol/oasis-sdk
 tee: tdx
 kind: raw
@@ -47,7 +47,11 @@ deployments:
         - id: 33R8MVGCGJg3CAYKDR87Zv2kvj65lbpcAHmZLKRA5FYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 0.2.1
         - id: Sa0PyyZJsj4UpjE6IJOyqsi92iNMrwULpRbF2tq8YmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 0.2.2
         - id: zt08xPOoXhy1SWHNcBNalVDjf6EHAUu9x6Tvq7aOBrwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 0.2.2
+        - id: p+wMY5zEuP5geFAkuoxI7NFiszMMTJHgdGxizuCZdwkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+        - id: WbUlJcnxwoy4NGyKgKIRlYF4OL7zHuvQVQ0yhbOvYcYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
       endorsements:
         - any: {}
       fees: endorsing_node
@@ -88,7 +92,11 @@ deployments:
         - id: erQlwbWIEIx3WdLCqb7C/wWsDjDQgTW5VssQb9APrKMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 0.2.1
         - id: Iq6cDWfVpHrAfgbFvaEqhnZ7YCDHfoXEWlU5n2xFnJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 0.2.2
         - id: e9QSiflGUzqJei84tKL8N81HOMKkOXLfU6X/M/p00N0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 0.2.2
+        - id: XYyfBM8gNwSOBvKutXlel9xo6g4paIhq4RiQWEBRdMkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+        - id: Etnh0TxJ4Kng2qrVe/M78OX53r0TJlPe+Ripp0n1nnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
       endorsements:
         - any: {}
       fees: endorsing_node

rofl-scheduler/src/client.rs

@@ -55,7 +55,8 @@ impl MarketClient {
             .env
             .client()
             .sign_and_submit_tx(self.env.signer(), tx)
-            .await?;
+            .await?
+            .ok()?;
 
         Ok(())
     }
@@ -74,7 +75,8 @@ impl MarketClient {
             .env
             .client()
             .sign_and_submit_tx(self.env.signer(), tx)
-            .await?;
+            .await?
+            .ok()?;
 
         Ok(())
     }
@@ -93,7 +95,8 @@ impl MarketClient {
             .env
             .client()
             .sign_and_submit_tx(self.env.signer(), tx)
-            .await?;
+            .await?
+            .ok()?;
 
         Ok(())
     }
@@ -112,7 +115,8 @@ impl MarketClient {
             .env
             .client()
             .sign_and_submit_tx(self.env.signer(), tx)
-            .await?;
+            .await?
+            .ok()?;
 
         Ok(())
     }
@@ -134,6 +138,22 @@ impl MarketQueryClient {
         self.round
     }
 
+    /// Query specific instance.
+    pub async fn instance(&self, id: InstanceId) -> Result<Instance> {
+        self.parent
+            .env
+            .client()
+            .query(
+                self.round,
+                "roflmarket.Instance",
+                InstanceQuery {
+                    provider: self.parent.provider,
+                    id,
+                },
+            )
+            .await
+    }
+
     /// Query all provider's instances.
     pub async fn instances(&self) -> Result<Vec<Instance>> {
         self.parent

rofl-scheduler/src/manager.rs

@@ -298,19 +298,13 @@ impl Manager {
         // Discover desired instance state.
         let instances: Vec<Instance> = local_state.client.instances().await?;
         for instance in instances {
-            // Remove known instances.
-            running_unknown.remove(&instance.id);
-
             match instance.status {
                 InstanceStatus::Created => {
                     // Instance has not yet been accepted, nothing to do.
                     continue;
                 }
                 InstanceStatus::Cancelled => {
-                    // Instance has been cancelled, make sure it is stopped if running.
-                    if local_state.running.contains_key(&instance.id) {
-                        local_state.pending_stop.push((instance.id, true));
-                    }
+                    // Instance has been cancelled.
                     local_state
                         .maybe_remove
                         .push((instance.id, instance.updated_at));
@@ -325,6 +319,9 @@ impl Manager {
                 }
             }
 
+            // Remove known instances. Any remaining unknown instances will be stopped.
+            running_unknown.remove(&instance.id);
+
             // Check if the instance is still paid for. If not, we immediately stop it and schedule
             // its removal.
             if instance.paid_until < now {
@@ -614,13 +611,6 @@ impl Manager {
                     .or_default()
                     .node_id = Some(local_node_id);
             }
-
-            // Queue a job to deploy when a deployment exists.
-            if let Some(deployment) = instance.deployment.clone() {
-                local_state
-                    .pending_start
-                    .push((instance, deployment.clone(), true));
-            }
         }
 
         Ok(())
@@ -824,6 +814,17 @@ impl Manager {
             return Ok(());
         }
 
+        // XXX: Temporarily skip instances that cannot be removed due to a claim bug.
+        let info = self
+            .client
+            .queries_at_latest()
+            .await?
+            .instance(instance)
+            .await?;
+        if info.paid_until == info.paid_from {
+            return Ok(());
+        }
+
         self.client.remove_instance(instance).await?;
 
         let mut instances = self.instances.write().unwrap();

runtime-sdk/modules/rofl-market/src/payment.rs

@@ -273,7 +273,7 @@ impl PaymentMethod for Payment {
                     .checked_mul(total_amount)
                     .ok_or(Error::InvalidArgument)?
                     .checked_div(paid_time.into())
-                    .ok_or(Error::InvalidArgument)?;
+                    .unwrap_or(0);
 
                 <C::Runtime as Runtime>::Accounts::transfer(
                     instance_address,

runtime-sdk/modules/rofl-market/src/test.rs

@@ -816,6 +816,10 @@ fn test_instance_management() {
     assert_eq!(module, "roflmarket");
     assert_eq!(code, 4); // Forbidden.
 
+    // Ensure we are after paid_until to test the claim case.
+    mock.runtime_header.timestamp = instance.paid_until + 10;
+    let ctx = mock.create_ctx_for_runtime::<TestRuntime>(true);
+
     // Scheduler app from the correct node should be allowed to remove instances.
     let dispatch_result = signer_dave.call(&ctx, "roflmarket.InstanceRemove", remove.clone());
     assert!(dispatch_result.result.is_success(), "call should succeed");

runtime-sdk/src/modules/rofl/app/client.rs

@@ -63,7 +63,7 @@ pub struct SubmitTxOpts {
 impl Default for SubmitTxOpts {
     fn default() -> Self {
         Self {
-            timeout: Some(Duration::from_millis(15_000)), // 15 seconds.
+            timeout: Some(Duration::from_millis(60_000)), // 60 seconds.
             encrypt: true,
             verify: true,
         }