Merge pull request ray-project#2 from eisber/marcozo/azure_autoscaler_v2

Marcozo/azure autoscaler v2

Author: gramhagen

python/MANIFEST.in

@@ -0,0 +1 @@
+include ray/ray-schema.json

python/ray/autoscaler/autoscaler.py

@@ -12,6 +12,8 @@
 import numpy as np
 import ray.services as services
 import yaml
+import jsonschema
+from importlib_resources import read_text
 from ray.worker import global_worker
 from ray.autoscaler.docker import dockerize_if_needed
 from ray.autoscaler.node_provider import get_node_provider, \
@@ -25,7 +27,6 @@
     AUTOSCALER_MAX_LAUNCH_BATCH, AUTOSCALER_MAX_CONCURRENT_LAUNCHES, \
     AUTOSCALER_UPDATE_INTERVAL_S, AUTOSCALER_HEARTBEAT_TIMEOUT_S, \
     AUTOSCALER_RESOURCE_REQUEST_CHANNEL, MEMORY_RESOURCE_UNIT_BYTES
-from six import string_types
 from six.moves import queue
 
 logger = logging.getLogger(__name__)
@@ -774,61 +775,13 @@ def kill_workers(self):
             len(nodes)))
 
 
-def typename(v):
-    if isinstance(v, type):
-        return v.__name__
-    else:
-        return type(v).__name__
-
-
-def check_required(config, schema):
-    # Check required schema entries
-    if not isinstance(config, dict):
-        raise ValueError("Config is not a dictionary")
-
-    for k, (v, kreq) in schema.items():
-        if v is None:
-            continue  # None means we don't validate the field
-        if kreq is REQUIRED:
-            if k not in config:
-                type_str = typename(v)
-                raise ValueError(
-                    "Missing required config key `{}` of type {}".format(
-                        k, type_str))
-            if not isinstance(v, type):
-                check_required(config[k], v)
-
-
-def check_extraneous(config, schema):
-    """Make sure all items of config are in schema"""
-    if not isinstance(config, dict):
-        raise ValueError("Config {} is not a dictionary".format(config))
-    for k in config:
-        if k not in schema:
-            raise ValueError("Unexpected config key `{}` not in {}".format(
-                k, list(schema.keys())))
-        v, kreq = schema[k]
-        if v is None:
-            continue
-        elif isinstance(v, type):
-            if not isinstance(config[k], v):
-                if v is str and isinstance(config[k], string_types):
-                    continue
-                raise ValueError(
-                    "Config key `{}` has wrong type {}, expected {}".format(
-                        k,
-                        type(config[k]).__name__, v.__name__))
-        else:
-            check_extraneous(config[k], v)
-
-
 def validate_config(config, schema=CLUSTER_CONFIG_SCHEMA):
     """Required Dicts indicate that no extra fields can be introduced."""
     if not isinstance(config, dict):
         raise ValueError("Config {} is not a dictionary".format(config))
 
-    check_required(config, schema)
-    check_extraneous(config, schema)
+    schema = read_text("ray", "ray-schema.json")
+    jsonschema.validate(config, json.loads(schema))
 
 
 def fillout_defaults(config):

python/ray/autoscaler/azure/vmImageBuild.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# Resource group name - we are using myImageBuilderRG in this example
+imageResourceGroup=marcozo-ray-vm-image-10
+# Datacenter location - we are using West US in this example
+location=WestUS2
+# Name for the image - we are using myBuilderImage in this example
+imageName=ray-dev-image
+# Run output name
+runOutputName=ray-dev-image-run
+# VM Image Name
+imageName=ray-dev-image-01
+
+subscriptionID=6187b663-b744-4d24-8226-7e66525baf8f
+
+echo Create the resource group
+az group create -n $imageResourceGroup -l $location
+
+echo Set permissions on the resource group for the image builder
+az role assignment create \
+    --assignee cf32a0cc-373c-47c9-9156-0db11f6a6dfc \
+    --role Contributor \
+    --scope /subscriptions/$subscriptionID/resourceGroups/$imageResourceGroup
+
+az role assignment create \
+    --assignee ef511139-6170-438e-a6e1-763dc31bdf74 \
+    --role Contributor \
+    --scope /subscriptions/$subscriptionID/resourceGroups/$imageResourceGroup
+
+# Apply the values
+sed -i -e "s/<subscriptionID>/$subscriptionID/g" vmImageDevTemplate.json
+sed -i -e "s/<rgName>/$imageResourceGroup/g" vmImageDevTemplate.json
+sed -i -e "s/<region>/$location/g" vmImageDevTemplate.json
+sed -i -e "s/<imageName>/$imageName/g" vmImageDevTemplate.json
+sed -i -e "s/<runOutputName>/$runOutputName/g" vmImageDevTemplate.json
+
+echo Submit the image configuration
+az resource create \
+    --resource-group $imageResourceGroup \
+    --properties @vmImageDevTemplate.json \
+    --is-full-object \
+    --resource-type Microsoft.VirtualMachineImages/imageTemplates \
+    -n $imageName
+
+# Cleanup if above failed
+# az resource delete \
+#    --resource-group $imageResourceGroup \
+#    --resource-type Microsoft.VirtualMachineImages/imageTemplates \
+#    -n $imageName
+
+echo Start the image build
+az resource invoke-action \
+     --resource-group $imageResourceGroup \
+     --resource-type  Microsoft.VirtualMachineImages/imageTemplates \
+     -n $imageName \
+     --action Run

python/ray/autoscaler/azure/vmImageDevTemplate.json

@@ -0,0 +1,54 @@
+{
+    "type": "Microsoft.VirtualMachineImages/imageTemplates",
+    "apiVersion": "2019-05-01-preview",
+    "location": "WestUS2",
+    "dependsOn": [],
+    "tags": {
+        "imagebuilderTemplate": "ubuntu1804"
+            },
+    "properties": {
+
+        "buildTimeoutInMinutes" : 300,
+        
+        "vmProfile": 
+            {
+            "vmSize": "Standard_D2s_v3"
+            },
+
+        "source": {
+            "type": "PlatformImage",
+                "publisher": "microsoft-dsvm",
+                "offer": "ubuntu-1804",
+                "sku": "1804",
+                "version": "20.02.01"
+            
+        },
+        "customize": [
+            {
+                "type": "Shell",
+                "name": "Build Ray",
+                "inline": [
+                    "sudo mkdir -p /opt/ray",
+                    "sudo bash -c 'git clone https://github.com/ray-project/ray /opt/ray || true'",
+                    "sudo /opt/ray/ci/travis/install-bazel.sh",
+                    "sudo /anaconda/condabin/conda init bash",
+                    "sudo bash -c 'cd /opt/ray/python/ray/dashboard/client; npm ci; npm run build || true'",
+                    "sudo bash -c '/anaconda/envs/py37_default/bin/pip install azure-cli-core azure-core azure-mgmt-msi paramiko aiohttp grpcio psutil setproctitle'",
+                    "sudo bash -c 'cd /opt/ray/python; /anaconda/envs/py37_default/bin/pip install -e . --verbose'"
+                ]
+            }
+        ],
+        "distribute": 
+            [
+                {   "type":"ManagedImage",
+                    "imageId": "/subscriptions/6187b663-b744-4d24-8226-7e66525baf8f/resourceGroups/marcozo-ray-vm-image/providers/Microsoft.Compute/images/ray-dev-image-01",
+                    "location": "WestUS2",
+                    "runOutputName": "ray-dev-image-run",
+                    "artifactTags": {
+                        "source": "azVmImageBuilder",
+                        "baseosimg": "ubuntu1804"
+                    }
+                }
+            ]
+        }
+    }