fix orchestrator statemachine and Process from archiveresult migrations

archivebox/core/migrations/0025_alter_archiveresult_options_alter_snapshot_options_and_more.py

@@ -57,18 +57,8 @@ class Migration(migrations.Migration):
             name='snapshot',
             options={'verbose_name': 'Snapshot', 'verbose_name_plural': 'Snapshots'},
         ),
-        migrations.RemoveField(
-            model_name='archiveresult',
-            name='cmd',
-        ),
-        migrations.RemoveField(
-            model_name='archiveresult',
-            name='cmd_version',
-        ),
-        migrations.RemoveField(
-            model_name='archiveresult',
-            name='pwd',
-        ),
+        # NOTE: RemoveField for cmd, cmd_version, pwd moved to migration 0027
+        # to allow data migration to Process records first
         migrations.AddField(
             model_name='archiveresult',
             name='config',

archivebox/core/models.py

@@ -2208,7 +2208,7 @@ class SnapshotMachine(BaseStateMachine, strict_states=True):
     tick = (
         queued.to.itself(unless='can_start') |
         queued.to(started, cond='can_start') |
-        started.to.itself(unless='is_finished') |
+        started.to.itself(unless='is_finished', on='on_started_to_started') |
         started.to(sealed, cond='is_finished')
     )
 
@@ -2243,6 +2243,13 @@ class SnapshotMachine(BaseStateMachine, strict_states=True):
             status=Snapshot.StatusChoices.STARTED,
         )
 
+    def on_started_to_started(self):
+        """Called when Snapshot stays in started state (archiveresults not finished yet)."""
+        # Bump retry_at so we check again in a few seconds
+        self.snapshot.update_and_requeue(
+            retry_at=timezone.now() + timedelta(seconds=5),
+        )
+
     @sealed.enter
     def enter_sealed(self):
         # Clean up background hooks