Merge branch 'develop' into dynamic-placement-groups

Author: dougalb

CHANGELOG.rst

@@ -2,6 +2,10 @@
 CHANGELOG
 =========
 
+1.0.1
+=====
+* bugfix:``cfncluster-node``: Fix for nodes being disabled when maintain_initial_size is true
+
 1.0.0
 =====
 Offiical release of the CfnCluster 1.x CLI, templates and AMIs. Available in all regions except BJS, with

cli/setup.py

@@ -20,7 +20,7 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 console_scripts = ['cfncluster = cfncluster.cli:main']
-version = "1.0.0"
+version = "1.0.1"
 requires = ['boto>=2.39'] 
 
 if sys.version_info[:2] == (2, 6):

docs/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.0'
+release = '1.0.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

node/nodewatcher/nodewatcher.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python2.6
 
-# Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the
 # License. A copy of the License is located at
@@ -122,15 +122,25 @@ def lockHost(s,hostname,unlock=False):
     return _r
 
 def selfTerminate(region, asg, instance_id):
+    _as_conn = boto.ec2.autoscale.connect_to_region(region,proxy=boto.config.get('Boto', 'proxy'),
+                                          proxy_port=boto.config.get('Boto', 'proxy_port'))
+    if not maintainSize(region, asg):
+        log.info("terminating %s" % instance_id)
+        _as_conn.terminate_instance(instance_id, decrement_capacity=True)
+
+def maintainSize(region, asg):
     _as_conn = boto.ec2.autoscale.connect_to_region(region,proxy=boto.config.get('Boto', 'proxy'),
                                           proxy_port=boto.config.get('Boto', 'proxy_port'))
     _asg = _as_conn.get_all_groups(names=[asg])[0]
     _capacity = _asg.desired_capacity
     _min_size = _asg.min_size
     log.debug("capacity=%d min_size=%d" % (_capacity, _min_size))
     if _capacity > _min_size:
-        log.info("terminating %s" % instance_id)
-        _as_conn.terminate_instance(instance_id, decrement_capacity=True)
+        log.debug('capacity greater then min size.')
+        return False
+    else:
+        log.debug('capacity less then or equal to min size.')
+        return True
 
 def main():
     logging.basicConfig(
@@ -157,6 +167,8 @@ def main():
         if jobs == True:
             log.info('Instance has active jobs.')
         else:
+            if maintainSize(region, asg):
+                continue
             # avoid race condition by locking and verifying
             lockHost(s, hostname)
             jobs = getJobs(s, hostname)

node/setup.py

@@ -21,7 +21,7 @@ def read(fname):
 
 console_scripts = ['sqswatcher = sqswatcher.sqswatcher:main', 
                    'nodewatcher = nodewatcher.nodewatcher:main']
-version = "1.0.0"
+version = "1.0.1"
 requires = ['boto>=2.39', 'paramiko', 'python-dateutil'] 
 
 if sys.version_info[:2] == (2, 6):