Bug when transferring raw data between servers pre-analysis found -- …

…need test
lehtiolab · Jun 25, 2024 · 771f9e6 · 771f9e6
1 parent 196af34
commit 771f9e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/deploy/storage_tasks.yml b/deploy/storage_tasks.yml
@@ -25,8 +25,8 @@
   become: yes
   become_user: '{{ kanteleuser }}'
   ansible.builtin.copy:
-    src: files/ssh_key_rsync.secret
-    dest: "{{ rsync_ssh_key_file }}"
+    src: "{{ item.0 }}"
+    dest: "{{ item.1 }}"
     owner: "{{ kanteleuser }}"
     group: "{{ kanteleuser }}"
     mode: '400'

diff --git a/src/backend/analysis/views.py b/src/backend/analysis/views.py
@@ -1163,9 +1163,9 @@ def start_analysis(request):
         return JsonResponse({'error': 'Only waiting/canceled jobs can be (re)started, this job is {}'.format(job.state)}, status=403)
 
     primary_share = rm.ServerShare.objects.get(name=settings.PRIMARY_STORAGESHARENAME)
-    for dset in am.DatasetAnalysis.objects.filter(analysis_id=job.nextflowsearch.analysis_id): 
-        if dset.storageshare.server != primary_share.server:
-            if error := move_dset_project_servershare(dset, settings.PRIMARY_STORAGESHARENAME):
+    for dsa in am.DatasetAnalysis.objects.filter(analysis_id=job.nextflowsearch.analysis_id): 
+        if dsa.dataset.storageshare.server != primary_share.server:
+            if error := move_dset_project_servershare(dsa.dataset, settings.PRIMARY_STORAGESHARENAME):
                 return JsonResponse({'error': error}, status=403)
 
     jv.do_retry_job(job)