Supporting Python3.10 (#22)

.github/workflows/automated-test.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.9
+    - name: Set up Python 3.10
       uses: actions/setup-python@v4
       with:
-        python-version: 3.9
+        python-version: 3.10.12
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

README.md

@@ -11,17 +11,16 @@ Mohammad Shahrad, Jonathan Balkind, and David Wentzlaff. "[Architectural Implica
 
 ## Setting Things Up
 
-### Set up OpenWhisk
+### Set up OpenWhisk if testing locally
+[You don't need this if you intend to use the *generic endpoint* mode to test remote functions.]
 
 FaaSProfiler has been fully tested on [OpenWhisk](https://github.com/apache/openwhisk). Please make sure to set up and install [OpenWhisk](https://github.com/apache/openwhisk) before using FaaSProfiler.
 
 **Important Note**: Some of the default [OpenWhisk configuration](https://github.com/apache/openwhisk/blob/master/ansible/group_vars/all) limits might be too restrictive for your setup. Do not forget to configure those parameters (particularly these: `invocationsPerMinute`, `concurrentInvocations`, `firesPerMinute`, and `sequenceMaxLength`).
 
-**Note**: We plan to add support for other popular serverless platforms. Help from the community is highly appreciated.
-
 ### Configure  FaaSProfiler
 
-After cloning this repo run the one-time configuration:
+After cloning this repo run the one-time configuration script:
 ```
 bash configure.sh
 ```
@@ -87,12 +86,12 @@ The [Comparative Analyzer](./comparative_analyzer) module compares the results o
 
 Environment/Tool | Tested Version(s)
 ---------------- | --------------
-Python | Python 3.x
+Python 3.8 (fully tested) | Python 3.10 (partially tested)
 OS | Ubuntu 16.04.4 LTS, Ubuntu 20.04.1 LTS
 
 Python Library | Latest Tested Version
 ---------------- | --------------
-requests-futures | 1.0.0
+requests-futures | 1.0.1
 matplotlib | 3.3.3
 numpy | 1.19.5
 pandas | 1.2.0

configure.sh

@@ -3,7 +3,7 @@
 
 # Installing some dependencies if needed
 sudo apt-get install -y moreutils
-sudo python3 -m pip install -r requirements.txt
+python3.10 -m pip install -r requirements.txt
 
 # Configure path variables used by the platform 
 ROOTLINE='FAAS_ROOT="'$(echo $PWD)'"'
@@ -15,5 +15,15 @@ echo $ROOTLINE | cat - invocation-scripts/monitoring.sh | sponge invocation-scri
 echo $ROOTLINE | cat - monitoring/RuntimeMonitoring.sh | sponge monitoring/RuntimeMonitoring.sh
 
 # Make local directories
-mkdir logs
-mkdir data_archive
+if [ -d "logs" ]
+then
+    echo "Directory logs already exists."
+else
+    mkdir logs
+fi
+if [ -d "data_archive" ]
+then
+    echo "Directory data_archive already exists."
+else
+    mkdir data_archive
+fi

requirements.txt

@@ -1,5 +1,5 @@
 coverage
-requests_futures
+requests_futures==1.0.1
 matplotlib
 numpy
 pandas

synthetic_workload_invoker/WorkloadInvoker.py

@@ -67,7 +67,7 @@ def HTTPInstanceGeneratorOW(action, instance_times, blocking_cli, param_file=Non
     """
     if len(instance_times) == 0:
         return False
-    session = FuturesSession(max_workers=15)
+    session = FuturesSession(max_workers=16)
     url = base_url + action
     parameters = {"blocking": blocking_cli, "result": RESULT}
     authentication = (user_pass[0], user_pass[1])
@@ -114,7 +114,7 @@ def BinaryDataHTTPInstanceGeneratorOW(action, instance_times, blocking_cli, data
     This function is used to invoke a function with binary data as input.
     """
     url = base_gust_url + action
-    session = FuturesSession(max_workers=15)
+    session = FuturesSession(max_workers=16)
     if len(instance_times) == 0:
         return False
     after_time, before_time = 0, 0
@@ -153,7 +153,7 @@ def HTTPInstanceGeneratorGeneric(instance_times, blocking_cli, url, data):
         logger.error("Invalid URL: " + url)
         return False
 
-    session = FuturesSession(max_workers=100)
+    session = FuturesSession(max_workers=16)
     parameters = {"blocking": blocking_cli, "result": RESULT}
     after_time, before_time = 0, 0
 
@@ -300,6 +300,9 @@ def main(argv):
     logger.info("Test started")
     for thread in threads:
         thread.start()
+    logger.info("Waiting for invocation threads to join")
+    for thread in threads:
+        thread.join()
     logger.info("Test ended")
 
     return True