Merge pull request #1344 from JosepSampe/lithops-dev

Fix some potential issues
lithops-cloud · May 11, 2024 · 035b94b · 035b94b
2 parents 8bb9cea + e9766d8
commit 035b94b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/functional_tests.yml b/.github/workflows/functional_tests.yml
@@ -16,15 +16,13 @@ jobs:
 
     outputs:
       localhost: ${{ steps.script.outputs.localhost }}
-      ibm_cf: ${{ steps.script.outputs.ibm_cf }}
       code_engine: ${{ steps.script.outputs.code_engine }}
 
     steps:
       - name: Set jobs to run
         id: script
         run: |
           echo "localhost=true" >> $GITHUB_OUTPUT
-          echo "ibm_cf=false" >> $GITHUB_OUTPUT
           echo "code_engine=false" >> $GITHUB_OUTPUT
 
 
@@ -35,10 +33,10 @@ jobs:
 
     steps:
       - name: Clone Lithops repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 
@@ -59,10 +57,10 @@ jobs:
 
     steps:
       - name: Clone Lithops repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 

diff --git a/.github/workflows/on_pull_request.yml b/.github/workflows/on_pull_request.yml
@@ -22,10 +22,10 @@ jobs:
 
     steps:
       - name: Clone Lithops repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -43,10 +43,10 @@ jobs:
 
     steps:
       - name: Clone Lithops repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 

diff --git a/lithops/localhost/v2/localhost.py b/lithops/localhost/v2/localhost.py
@@ -324,7 +324,10 @@ def kill_process(process):
             for job_key_call_id in list(self.task_processes.keys()):
                 if job_key_call_id.startswith(job_key):
                     process = self.task_processes[job_key_call_id]
-                    kill_process(process)
+                    try:
+                        kill_process(process)
+                    except Exception:
+                        pass
                     self.task_processes[job_key_call_id] = None
 
         super().stop(job_keys)

diff --git a/lithops/worker/jobrunner.py b/lithops/worker/jobrunner.py
@@ -18,6 +18,7 @@
 import os
 import io
 import sys
+import ast
 import pika
 import time
 import pickle
@@ -209,7 +210,7 @@ def run(self):
             func = pickle.loads(self.job.func)
             data = pickle.loads(self.job.data)
 
-            if eval(os.environ.get('__LITHOPS_REDUCE_JOB', 'False')):
+            if ast.literal_eval(os.environ.get('__LITHOPS_REDUCE_JOB', 'False')):
                 self._wait_futures(data)
             elif is_object_processing_function(func):
                 self._load_object(data)

diff --git a/lithops/worker/status.py b/lithops/worker/status.py
@@ -1,4 +1,5 @@
 import os
+import ast
 import pika
 import json
 import time
@@ -44,7 +45,7 @@ def __init__(self, job, internal_storage):
             'chunksize': job.chunksize
         }
 
-        if eval(os.environ.get('WARM_CONTAINER', 'False')):
+        if ast.literal_eval(os.environ.get('WARM_CONTAINER', 'False')):
             self.status['worker_cold_start'] = False
         else:
             self.status['worker_cold_start'] = True