diff --git a/ChangeLog b/ChangeLog index d94789a3..6a451bd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-02-28 S. Thiell + + * Version 1.7.1 released. + 2016-02-27 S. Thiell * Worker/Tree.py: implement tree mode reverse copy using tar commands to diff --git a/doc/man/man1/clubak.1 b/doc/man/man1/clubak.1 index 5091780a..7c30c3e8 100644 --- a/doc/man/man1/clubak.1 +++ b/doc/man/man1/clubak.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH CLUBAK 1 "2015-11-05" "1.7" "ClusterShell User Manual" +.TH CLUBAK 1 "2016-02-28" "1.7.1" "ClusterShell User Manual" .SH NAME clubak \- format output from clush/pdsh-like output and more . diff --git a/doc/man/man1/clush.1 b/doc/man/man1/clush.1 index 1853e169..6aad8d1b 100644 --- a/doc/man/man1/clush.1 +++ b/doc/man/man1/clush.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH CLUSH 1 "2015-11-01" "1.7" "ClusterShell User Manual" +.TH CLUSH 1 "2016-02-28" "1.7.1" "ClusterShell User Manual" .SH NAME clush \- execute shell commands on a cluster . diff --git a/doc/man/man1/nodeset.1 b/doc/man/man1/nodeset.1 index 643fbf85..4e678c93 100644 --- a/doc/man/man1/nodeset.1 +++ b/doc/man/man1/nodeset.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH NODESET 1 "2016-02-09" "1.7.1" "ClusterShell User Manual" +.TH NODESET 1 "2016-02-28" "1.7.1" "ClusterShell User Manual" .SH NAME nodeset \- compute advanced nodeset operations . diff --git a/doc/man/man5/clush.conf.5 b/doc/man/man5/clush.conf.5 index b6543274..2a5c041f 100644 --- a/doc/man/man5/clush.conf.5 +++ b/doc/man/man5/clush.conf.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH CLUSH.CONF 5 "2015-08-27" "1.7" "ClusterShell User Manual" +.TH CLUSH.CONF 5 "2016-02-28" "1.7.1" "ClusterShell User Manual" .SH NAME clush.conf \- Configuration file for clush . diff --git a/doc/man/man5/groups.conf.5 b/doc/man/man5/groups.conf.5 index 271895f4..b3eda142 100644 --- a/doc/man/man5/groups.conf.5 +++ b/doc/man/man5/groups.conf.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH GROUPS.CONF 5 "2015-11-06" "1.7" "ClusterShell User Manual" +.TH GROUPS.CONF 5 "2016-02-28" "1.7.1" "ClusterShell User Manual" .SH NAME groups.conf \- Configuration file for ClusterShell node groups . diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py index c94b8619..da683e96 100644 --- a/doc/sphinx/conf.py +++ b/doc/sphinx/conf.py @@ -48,9 +48,9 @@ # built documents. # # The short X.Y version. -version = '1.7' +version = '1.7.1' # The full version, including alpha/beta/rc tags. -release = '1.7' +release = '1.7.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/sphinx/guide/nodesets.rst b/doc/sphinx/guide/nodesets.rst index 970cd1bb..e6d012b5 100644 --- a/doc/sphinx/guide/nodesets.rst +++ b/doc/sphinx/guide/nodesets.rst @@ -1,3 +1,5 @@ +.. _guide-NodeSet: + Node sets handling ================== diff --git a/doc/sphinx/release.rst b/doc/sphinx/release.rst index 2d166a4c..6a156dab 100644 --- a/doc/sphinx/release.rst +++ b/doc/sphinx/release.rst @@ -3,6 +3,21 @@ Release Notes ============= +Version 1.7.1 +------------- + +This minor version contains a few bug fixes, mostly related to +:ref:`guide-NodeSet`. + +This version also contains bug fixes and performance improvements in tree +propagation mode. + +For more details, please have a look at `GitHub Issues for 1.7.1 milestone`_. + +ClusterShell 1.7.1 is compatible with Python 2.4 up to Python 2.7 (for +example: from RedHat EL5 to EL7). Upgrades from versions 1.6 or 1.7 are +supported. + Version 1.7 ----------- @@ -25,7 +40,7 @@ Maintenance release Version 1.7 and possible future minor versions 1.7.x are compatible with Python 2.4 up to Python 2.7 (for example: from RedHat EL5 to EL7). Upgrade -from version 1.6 to 1.7 should be painless and are fully supported. +from version 1.6 to 1.7 should be painless and is fully supported. The next major version of ClusterShell will require at least Python 2.6. We will also soon start working on Python 3 support. @@ -233,3 +248,5 @@ configuration files:: $ pip install --user clustershell Please see :ref:`install-pip-user`. + +.. _GitHub Issues for 1.7.1 milestone: https://github.com/cea-hpc/clustershell/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A1.7.1+ diff --git a/doc/txt/clubak.txt b/doc/txt/clubak.txt index b5849b8e..909203a5 100644 --- a/doc/txt/clubak.txt +++ b/doc/txt/clubak.txt @@ -7,9 +7,9 @@ format output from clush/pdsh-like output and more -------------------------------------------------- :Author: Stephane Thiell -:Date: 2015-11-05 +:Date: 2016-02-28 :Copyright: CeCILL-C V1 -:Version: 1.7 +:Version: 1.7.1 :Manual section: 1 :Manual group: ClusterShell User Manual diff --git a/doc/txt/clush.conf.txt b/doc/txt/clush.conf.txt index 0e4e2153..2437ffe5 100644 --- a/doc/txt/clush.conf.txt +++ b/doc/txt/clush.conf.txt @@ -7,9 +7,9 @@ Configuration file for `clush` ------------------------------ :Author: Stephane Thiell, -:Date: 2015-08-27 +:Date: 2016-02-28 :Copyright: CeCILL-C V1 -:Version: 1.7 +:Version: 1.7.1 :Manual section: 5 :Manual group: ClusterShell User Manual diff --git a/doc/txt/clush.txt b/doc/txt/clush.txt index 6edbd217..5594426a 100644 --- a/doc/txt/clush.txt +++ b/doc/txt/clush.txt @@ -7,9 +7,9 @@ execute shell commands on a cluster ----------------------------------- :Author: Stephane Thiell -:Date: 2015-11-01 +:Date: 2016-02-28 :Copyright: CeCILL-C V1 -:Version: 1.7 +:Version: 1.7.1 :Manual section: 1 :Manual group: ClusterShell User Manual diff --git a/doc/txt/groups.conf.txt b/doc/txt/groups.conf.txt index fe7da0e7..ac508d4b 100644 --- a/doc/txt/groups.conf.txt +++ b/doc/txt/groups.conf.txt @@ -7,9 +7,9 @@ Configuration file for ClusterShell node groups ----------------------------------------------- :Author: Stephane Thiell, -:Date: 2015-11-06 +:Date: 2016-02-28 :Copyright: CeCILL-C V1 -:Version: 1.7 +:Version: 1.7.1 :Manual section: 5 :Manual group: ClusterShell User Manual diff --git a/doc/txt/nodeset.txt b/doc/txt/nodeset.txt index 2519eb0d..eec1983c 100644 --- a/doc/txt/nodeset.txt +++ b/doc/txt/nodeset.txt @@ -7,7 +7,7 @@ compute advanced nodeset operations ----------------------------------- :Author: Stephane Thiell -:Date: 2016-02-09 +:Date: 2016-02-28 :Copyright: CeCILL-C V1 :Version: 1.7.1 :Manual section: 1 diff --git a/lib/ClusterShell/Task.py b/lib/ClusterShell/Task.py index 615c9189..58f44b30 100644 --- a/lib/ClusterShell/Task.py +++ b/lib/ClusterShell/Task.py @@ -1302,7 +1302,8 @@ def _pchannel(self, gateway, metaworker): # create gateway channel if needed if gateway not in self.gateways: chan = PropagationChannel(self, gateway) - logging.getLogger(__name__).info("pchannel: creating new channel") + logger = logging.getLogger(__name__) + logger.info("pchannel: creating new channel %s", chan) # invoke gateway timeout = None # FIXME: handle timeout for gateway channels wrkcls = self.default('distant_worker') @@ -1328,19 +1329,19 @@ def _pchannel_release(self, gateway, metaworker): Lookup by gateway, decref associated metaworker set and release channel worker if needed. """ - logging.getLogger(__name__).info("pchannel_release %s %s", gateway, - metaworker) + logger = logging.getLogger(__name__) + logger.debug("pchannel_release %s %s", gateway, metaworker) if gateway not in self.gateways: - logging.getLogger(__name__).error("pchannel_release: no pchannel" - "found for gateway %s", - gateway) + logger.error("pchannel_release: no pchannel found for gateway %s", + gateway) else: # TODO: delay gateway closing when other gateways are running chanworker, metaworkers = self.gateways[gateway] metaworkers.remove(metaworker) if len(metaworkers) == 0: - logging.getLogger(__name__).info("worker finishing") + logger.info("pchannel_release: destroying channel %s", + chanworker.eh) chanworker.abort() # delete gateway reference del self.gateways[gateway] diff --git a/lib/ClusterShell/__init__.py b/lib/ClusterShell/__init__.py index df52da6b..c421a59e 100644 --- a/lib/ClusterShell/__init__.py +++ b/lib/ClusterShell/__init__.py @@ -1,5 +1,5 @@ # -# Copyright CEA/DAM/DIF (2007-2015) +# Copyright CEA/DAM/DIF (2007-2016) # Contributor: Stephane THIELL # # This file is part of the ClusterShell library. @@ -48,8 +48,8 @@ - ClusterShell.Task """ -__version__ = '1.7' +__version__ = '1.7.1' __version_info__ = tuple([ int(_n) for _n in __version__.split('.')]) -__date__ = '2015/11/10' +__date__ = '2016/02/28' __author__ = 'Stephane Thiell ' __url__ = 'http://clustershell.readthedocs.org/' diff --git a/setup.py b/setup.py index 5c472685..ae406199 100755 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright CEA/DAM/DIF (2008-2015) +# Copyright CEA/DAM/DIF (2008-2016) # Contributor: Stephane THIELL # # This file is part of the ClusterShell library. @@ -49,7 +49,7 @@ # User, in-prefix config install (rpmbuild or pip as user) CFGDIR = 'etc/clustershell' -VERSION='1.7' +VERSION='1.7.1' setup(name='ClusterShell', version=VERSION,