From 384f593c804cb722e9ada26ca020084c1ee0be9f Mon Sep 17 00:00:00 2001 From: Chris LaFreniere <40371649+chlafreniere@users.noreply.github.com> Date: Sat, 19 Sep 2020 13:21:47 -0700 Subject: [PATCH] Fix core and memory request MIAA deploy (#12505) * Fix core and memory request MIAA deploy * Memory request/limit as 2Gi for MIAA --- .../arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb | 4 ++-- extensions/arc/package.json | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb b/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb index d44e5f5c2a..83010abe7c 100644 --- a/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb +++ b/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb @@ -195,8 +195,8 @@ "\n", "cores_request_option = f' -cr \"{sql_instance_cores_request}\"' if sql_instance_cores_request else \"\"\n", "cores_limit_option = f' -cl \"{sql_instance_cores_limit}\"' if sql_instance_cores_limit else \"\"\n", - "memory_request_option = f' -mr \"{sql_instance_memory_request}Mi\"' if sql_instance_memory_request else \"\"\n", - "memory_limit_option = f' -ml \"{sql_instance_memory_limit}Mi\"' if sql_instance_memory_limit else \"\"\n", + "memory_request_option = f' -mr \"{sql_instance_memory_request}Gi\"' if sql_instance_memory_request else \"\"\n", + "memory_limit_option = f' -ml \"{sql_instance_memory_limit}Gi\"' if sql_instance_memory_limit else \"\"\n", "\n", "os.environ[\"AZDATA_USERNAME\"] = mssql_username\n", "os.environ[\"AZDATA_PASSWORD\"] = mssql_password\n", diff --git a/extensions/arc/package.json b/extensions/arc/package.json index 005b78b49b..2679cf2059 100644 --- a/extensions/arc/package.json +++ b/extensions/arc/package.json @@ -621,6 +621,7 @@ "description": "%arc.sql.cores-limit.description%", "variableName": "AZDATA_NB_VAR_SQL_CORES_LIMIT", "type": "number", + "min": 1, "required": false }, { @@ -628,6 +629,7 @@ "description": "%arc.sql.cores-request.description%", "variableName": "AZDATA_NB_VAR_SQL_CORES_REQUEST", "type": "number", + "min": 1, "required": false }, { @@ -635,6 +637,7 @@ "description": "%arc.sql.memory-limit.description%", "variableName": "AZDATA_NB_VAR_SQL_MEMORY_LIMIT", "type": "number", + "min": 2, "required": false }, { @@ -642,6 +645,7 @@ "description": "%arc.sql.memory-request.description%", "variableName": "AZDATA_NB_VAR_SQL_MEMORY_REQUEST", "type": "number", + "min": 2, "required": false } ]