Skip to content
This repository has been archived by the owner on Feb 3, 2021. It is now read-only.

Fix: --size-low-pri being ignored #593

Merged
merged 5 commits into from
Jun 5, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions aztk_cli/spark/endpoints/cluster/cluster_create.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import aztk.spark
from aztk.spark.models import ClusterConfiguration, UserConfiguration
from aztk.utils import deprecate
from aztk_cli import config, log, utils
from aztk_cli.config import load_aztk_spark_config

Expand All @@ -13,6 +14,8 @@ def setup_parser(parser: argparse.ArgumentParser):
parser.add_argument('--size', type=int,
help='Number of vms in your cluster')
parser.add_argument('--size-low-pri', type=int,
help='Number of low priority vms in your cluster (Deprecated, use --size-low-priority)')
parser.add_argument('--size-low-priority', type=int,
help='Number of low priority vms in your cluster')
parser.add_argument('--vm-size',
help='VM size for nodes in your cluster')
Expand All @@ -29,17 +32,21 @@ def setup_parser(parser: argparse.ArgumentParser):

parser.add_argument('--no-wait', dest='wait', action='store_false')
parser.add_argument('--wait', dest='wait', action='store_true')
parser.set_defaults(wait=None, size=None, size_low_priority=None)
parser.set_defaults(wait=None, size=None, size_low_pri=None, size_low_priority=None)


def execute(args: typing.NamedTuple):
spark_client = aztk.spark.Client(config.load_aztk_secrets())
cluster_conf = ClusterConfiguration()
cluster_conf.spark_configuration = load_aztk_spark_config()

# read cluster.yaml configuartion file, overwrite values with args
# read cluster.yaml configuration file, overwrite values with args
file_config, wait = config.read_cluster_config()
cluster_conf.merge(file_config)
if args.size_low_pri is not None:
deprecate("--size-low-pri has been deprecated. Please use --size-low-priority")
args.size_low_priority = args.size_low_pri

cluster_conf.merge(ClusterConfiguration(
cluster_id=args.cluster_id,
size=args.size,
Expand Down