Merge pull request #27 from cooperative-computing-lab/fix_thr

Fix throughput tests

Author: btovar

install-tarball.sh

@@ -1,14 +1,14 @@
 # Install a binary from the tarball distribution into $PREFIX
 
 # Get the common install setup
-.install-common.sh
+. ./install-common.sh
 
 # Choose the Ubuntu distribution
-TARBALL="cctools-nightly-x86_64-ubuntu20.04.tar.gz"
+TARBALL="cctools--x86_64-ubuntu24.04.tar.gz"
 PREFIX=`pwd`/cctools-install
 
 # Fetch the tarball
-wget --quiet "https://github.com/cooperative-computing-lab/cctools/releases/download/nightly/${TARBALL}"
+wget --quiet "https://github.com/cooperative-computing-lab/cctools/releases/download/devel/${TARBALL}"
 
 # Unpack into prefix
 mkdir -p ${PREFIX}

test-parrot-cvmfs.sh

@@ -15,9 +15,9 @@ then
 			echo "Could not access CVMFS!"
 			exit 1
 		fi
-	echo
-		echo "CVMFS driver is not enabled in Parrto!"
-		exit 1
+    else
+		echo "CVMFS driver is not enabled in Parrot for ubuntu!"
+		exit 0
 	fi
 else
 	echo "Parrot could not run /bin/true!"

test-vine-task-throughput.py

@@ -2,22 +2,29 @@
 
 import ndcctools.taskvine as vine
 import time
-import sys
+
 
 def func():
-    return 
+    return
+
 
 def main():
 
     q = vine.Manager()
     print("Creating Library from functions...")
-    function_lib = q.create_library_from_functions('test-library', func, add_env=False)
+    function_lib = q.create_library_from_functions("test-library", func, add_env=False)
     q.install_library(function_lib)
 
     print("listening on port", q.port)
-    factory = vine.Factory("local",manager_host_port="localhost:{}".format(q.port))
-    factory.max_workers=1
-    factory.min_workers=1
+    factory = vine.Factory("local", manager_host_port="localhost:{}".format(q.port))
+    factory.max_workers = 1
+    factory.min_workers = 1
+    factory.cores = 1
+    factory.memory = 2000
+    factory.disk = 2000
+    factory.debug_file = "stderr"
+    factory.debug = "all"
+    factory.extra_options = "--transfer-port=9123:9199"
 
     num_tasks = 1000
 
@@ -27,20 +34,20 @@ def main():
             task_id = q.submit(t)
 
         print("waiting for tasks to complete...")
-        
+
         start_timer = True
         while not q.empty():
 
             t = q.wait(5)
             if start_timer:
                 start = time.time()
                 start_timer = False
-    
+
         end = time.time()
         many = end - start
 
         start = time.time()
-    
+
         for i in range(num_tasks):
             while not q.empty():
                 result = q.wait(5)
@@ -50,11 +57,11 @@ def main():
         print("waiting for tasks to complete...")
         end = time.time()
         one = end - start
-        throughput = num_tasks/many
-        chaining = num_tasks/one
-        #serverless tasks
-        for i in range (num_tasks):
-            t = vine.FunctionCall('test-library', 'func')
+        throughput = num_tasks / many
+        chaining = num_tasks / one
+        # serverless tasks
+        for i in range(num_tasks):
+            t = vine.FunctionCall("test-library", "func")
             task_id = q.submit(t)
 
         print("Waiting for tasks to complete...")
@@ -70,24 +77,20 @@ def main():
         start = time.time()
         for i in range(num_tasks):
             while not q.empty():
-                result = q.wait(5)
-            t = vine.FunctionCall('test-library', 'func')
-            task_id = q.submit(t)
+                q.wait(5)
+            t = vine.FunctionCall("test-library", "func")
+            q.submit(t)
         end = time.time()
-        serverless_one = end-start
-    serverless_throughput = num_tasks/serverless_many
-    serverless_chaining = num_tasks/serverless_one
+        serverless_one = end - start
+    serverless_throughput = num_tasks / serverless_many
+    serverless_chaining = num_tasks / serverless_one
 
-    
     print(f"\nThroughput was {throughput} tasks per second")
     print(f"Chaining was {chaining} tasks per second")
     print(f"Serverless Throughput was {serverless_throughput} tasks per second")
     print(f"Serverless Chaining was {serverless_chaining} tasks per second")
     print("all tasks complete!")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
-
-# vim: set sts=4 sw=4 ts=4 expandtab ft=python:
-