Container support for AWS

benchmarks/wrappers/aws/python/setup.py

@@ -0,0 +1,15 @@
+from distutils.core import setup
+from glob import glob
+from pkg_resources import parse_requirements
+
+with open('requirements.txt') as f:
+    requirements = [str(r) for r in parse_requirements(f)]
+
+setup(
+    name='function',
+    install_requires=requirements,
+    packages=['function'],
+    package_dir={'function': '.'},
+    package_data={'function': glob('**', recursive=True)},
+)
+

config/example.json

@@ -1,13 +1,14 @@
 {
   "experiments": {
-    "deployment": "openwhisk",
+    "deployment": "aws",
     "update_code": false,
     "update_storage": false,
-    "download_results": false, 
+    "download_results": false,
     "architecture": "arm64", 
+    "container_deployment": true,
     "runtime": {
-      "language": "nodejs",
-      "version": "16"
+      "language": "python",
+      "version": "3.8"
     },
     "type": "invocation-overhead",
     "perf-cost": {

config/systems.json

@@ -1,6 +1,7 @@
 {
   "general": {
-    "docker_repository": "spcleth/serverless-benchmarks"
+    "docker_repository": "spcleth/serverless-benchmarks",
+    "container_deployment": ["aws"]
   },
   "local": {
     "experiments": {
@@ -61,25 +62,39 @@
     "languages": {
       "python": {
         "base_images": {
-          "3.11": "amazon/aws-lambda-python:3.11",
-          "3.10": "amazon/aws-lambda-python:3.10",
-          "3.9": "amazon/aws-lambda-python:3.9",
-          "3.8": "amazon/aws-lambda-python:3.8"
+          "x64": {
+            "3.11": "amazon/aws-lambda-python:3.11",
+            "3.10": "amazon/aws-lambda-python:3.10",
+            "3.9": "amazon/aws-lambda-python:3.9",
+            "3.8": "amazon/aws-lambda-python:3.8"
+          },
+          "arm64": {
+            "3.11": "amazon/aws-lambda-python:3.11.2024.05.23.17",
+            "3.10": "amazon/aws-lambda-python:3.10.2024.06.19.11",
+            "3.9": "amazon/aws-lambda-python:3.9.2024.05.20.23",
+            "3.8": "amazon/aws-lambda-python:3.8.2024.09.05.16"
+          }
         },
         "images": [
           "build"
         ],
         "deployment": {
           "files": [
             "handler.py",
-            "storage.py"
+            "storage.py",
+            "setup.py"
           ],
           "packages": []
         }
       },
       "nodejs": {
         "base_images": {
-          "16": "amazon/aws-lambda-nodejs:16"
+          "x64": {
+            "16": "amazon/aws-lambda-nodejs:16"
+          },
+          "arm64": {
+            "16": "amazon/aws-lambda-nodejs:16.2024.09.06.13"
+          }
         },
         "images": [
           "build"

dockerfiles/aws/nodejs/Dockerfile.function

@@ -0,0 +1,9 @@
+ARG BASE_IMAGE
+FROM $BASE_IMAGE
+COPY . function/
+COPY handler.js .
+RUN cd function \
+    && npm install --no-package-lock --production \
+    && npm cache clean --force
+
+CMD ["handler.handler"]

dockerfiles/aws/python/Dockerfile.function

@@ -0,0 +1,22 @@
+ARG BASE_IMAGE
+FROM $BASE_IMAGE
+ARG VERSION
+ENV PYTHON_VERSION=${VERSION}
+
+COPY . function/
+
+RUN touch function/__init__.py
+RUN if test -f "function/requirements.txt.${PYTHON_VERSION}"; then \
+        pip install --no-cache-dir \
+            -r function/requirements.txt \
+            -r function/requirements.txt.${PYTHON_VERSION} \
+            function/ && \
+        pip cache purge; \
+    else \
+        pip install --no-cache-dir \
+            -r function/requirements.txt \
+            function/ && \
+        pip cache purge; \
+    fi
+
+CMD ["function/handler.handler"]

docs/modularity.md

@@ -340,7 +340,7 @@ This function has been retrieved from the cache and requires refreshing function
 In practice, this is often limited to updating logging handlers - see existing implementations for details.
 
 ```python
-    def update_function(self, function: Function, code_package: Benchmark):
+    def update_function(self, function: Function, code_package: Benchmark, container_deployment: bool, container_uri: str):
 ```
 
 This function updates the function's code and configuration in the platform.

docs/usage.md

@@ -4,8 +4,7 @@ For each command you can pass `--verbose` flag to increase the verbosity of the
 By default, all scripts will create a cache in the directory `cache` to store code with
 dependencies and information on allocated cloud resources.
 Benchmarks will be rebuilt after a change in source code is detected.
-To enforce redeployment of code and benchmark inputs please use flags `--update-code`
-and `--update-storage`, respectively.
+To enforce redeployment of code, benchmark inputs, container deployment (supported in AWS) please use flags `--update-code`, `--update-storage` and `--container-deployment` respectively.
 
 **Note:** The cache does not support updating the cloud region. If you want to deploy benchmarks
 to a new cloud region, then use a new cache directory.

requirements.aws.txt

@@ -2,5 +2,4 @@ boto3
 botocore
 flake8-boto3
 urllib3
-boto3-stubs
-boto3-stubs[lambda,s3,apigatewayv2,sts,logs,iam]
+boto3-stubs[lambda,s3,apigatewayv2,sts,logs,iam,ecr]

requirements.txt

@@ -18,4 +18,5 @@ scipy
 #
 pycurl>=7.43
 click>=7.1.2
+rich
 

sebs.py

@@ -97,6 +97,11 @@ def common_params(func):
         type=click.Choice(["x64", "arm64"]),
         help="Target architecture",
     )
+    @click.option(
+        "--container-deployment/--no-container-deployment",
+        default=False,
+        help="Deploy functions as containers (AWS only). When enabled, functions are packaged as container images and pushed to Amazon ECR."
+    )
     @click.option(
         "--resource-prefix",
         default=None,
@@ -125,6 +130,7 @@ def parse_common_params(
     language,
     language_version,
     architecture,
+    container_deployment,
     resource_prefix: Optional[str] = None,
     initialize_deployment: bool = True,
     ignore_cache: bool = False,
@@ -148,6 +154,7 @@ def parse_common_params(
     update_nested_dict(config_obj, ["experiments", "update_code"], update_code)
     update_nested_dict(config_obj, ["experiments", "update_storage"], update_storage)
     update_nested_dict(config_obj, ["experiments", "architecture"], architecture)
+    update_nested_dict(config_obj, ["experiments", "container_deployment"], container_deployment)
 
     # set the path the configuration was loaded from
     update_nested_dict(config_obj, ["deployment", "local", "path"], config)
@@ -238,6 +245,7 @@ def invoke(
         sebs_client,
         deployment_client,
     ) = parse_common_params(**kwargs)
+
     if image_tag_prefix is not None:
         sebs_client.config.image_tag_prefix = image_tag_prefix
 
@@ -249,6 +257,7 @@ def invoke(
         experiment_config,
         logging_filename=logging_filename,
     )
+
     if memory is not None:
         benchmark_obj.benchmark_config.memory = memory
     if timeout is not None:
@@ -258,6 +267,7 @@ def invoke(
         benchmark_obj,
         function_name if function_name else deployment_client.default_function_name(benchmark_obj),
     )
+
     storage = deployment_client.get_storage(replace_existing=experiment_config.update_storage)
     input_config = benchmark_obj.prepare_input(storage=storage, size=benchmark_input_size)
 
@@ -371,7 +381,9 @@ def storage_start(storage, output_json, port):
 
     sebs.utils.global_logging()
     storage_type = sebs.SeBS.get_storage_implementation(StorageTypes(storage))
-    storage_config, storage_resources = sebs.SeBS.get_storage_config_implementation(StorageTypes(storage))
+    storage_config, storage_resources = sebs.SeBS.get_storage_config_implementation(
+        StorageTypes(storage)
+    )
     config = storage_config()
     resources = storage_resources()
 
@@ -405,7 +417,9 @@ def storage_stop(input_json):
             resources = storage_resources()
 
         logging.info(f"Stopping storage deployment of {storage_type}.")
-        storage = sebs.SeBS.get_storage_implementation(storage_type).deserialize(config, None, resources)
+        storage = sebs.SeBS.get_storage_implementation(storage_type).deserialize(
+            config, None, resources
+        )
         storage.stop()
         logging.info(f"Stopped storage deployment of {storage_type}.")
 
@@ -421,16 +435,28 @@ def local():
 @click.argument("output", type=str)
 @click.option("--deployments", default=1, type=int, help="Number of deployed containers.")
 @click.option("--storage-configuration", type=str, help="JSON configuration of deployed storage.")
-@click.option("--measure-interval", type=int, default=-1,
-              help="Interval duration between memory measurements in ms.")
+@click.option(
+    "--measure-interval",
+    type=int,
+    default=-1,
+    help="Interval duration between memory measurements in ms.",
+)
 @click.option(
     "--remove-containers/--no-remove-containers",
     default=True,
     help="Remove containers after stopping.",
 )
 @simplified_common_params
-def start(benchmark, benchmark_input_size, output, deployments, storage_configuration,
-          measure_interval, remove_containers, **kwargs):
+def start(
+    benchmark,
+    benchmark_input_size,
+    output,
+    deployments,
+    storage_configuration,
+    measure_interval,
+    remove_containers,
+    **kwargs,
+):
     """
     Start a given number of function instances and a storage instance.
     """
@@ -540,10 +566,7 @@ def resources():
 
 
 @resources.command("list")
-@click.argument(
-    "resource",
-    type=click.Choice(["buckets", "resource-groups"])
-)
+@click.argument("resource", type=click.Choice(["buckets", "resource-groups"]))
 @common_params
 def resources_list(resource, **kwargs):
 
@@ -568,32 +591,23 @@ def resources_list(resource, **kwargs):
             sebs_client.logging.error("Resource groups are only supported on Azure!")
             return
 
-        groups = deployment_client.config.resources.list_resource_groups(deployment_client.cli_instance)
+        groups = deployment_client.config.resources.list_resource_groups(
+            deployment_client.cli_instance
+        )
         sebs_client.logging.info("Resource grup:")
         for idx, bucket in enumerate(groups):
             sebs_client.logging.info(f"({idx}) {bucket}")
 
 
 @resources.command("remove")
-@click.argument(
-    "resource",
-    type=click.Choice(["buckets", "resource-groups"])
-)
-@click.argument(
-    "prefix",
-    type=str
-)
-@click.option(
-    "--wait/--no-wait",
-    type=bool,
-    default=True,
-    help="Wait for completion of removal."
-)
+@click.argument("resource", type=click.Choice(["buckets", "resource-groups"]))
+@click.argument("prefix", type=str)
+@click.option("--wait/--no-wait", type=bool, default=True, help="Wait for completion of removal.")
 @click.option(
     "--dry-run/--no-dry-run",
     type=bool,
     default=False,
-    help="Simulate run without actual deletions."
+    help="Simulate run without actual deletions.",
 )
 @common_params
 def resources_remove(resource, prefix, wait, dry_run, **kwargs):
@@ -626,13 +640,18 @@ def resources_remove(resource, prefix, wait, dry_run, **kwargs):
             sebs_client.logging.error("Resource groups are only supported on Azure!")
             return
 
-        groups = deployment_client.config.resources.list_resource_groups(deployment_client.cli_instance)
+        groups = deployment_client.config.resources.list_resource_groups(
+            deployment_client.cli_instance
+        )
         for idx, group in enumerate(groups):
             if len(prefix) > 0 and not group.startswith(prefix):
                 continue
 
             sebs_client.logging.info(f"Removing resource group: {group}")
-            deployment_client.config.resources.delete_resource_group(deployment_client.cli_instance, group, wait)
+            deployment_client.config.resources.delete_resource_group(
+                deployment_client.cli_instance, group, wait
+            )
+
 
 if __name__ == "__main__":
     cli()