From e32f2110ab412460088a1a5bdc09895e4743cb3d Mon Sep 17 00:00:00 2001 From: Darko Poljak Date: Tue, 13 Jun 2017 22:54:40 +0200 Subject: [PATCH] Document object prepare and object run parallelization. --- cdist/argparse.py | 5 +++-- docs/changelog | 3 +++ docs/src/cdist-parallelization.rst | 5 +++-- docs/src/man1/cdist.rst | 5 +++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/cdist/argparse.py b/cdist/argparse.py index 3791e779..045c12bc 100644 --- a/cdist/argparse.py +++ b/cdist/argparse.py @@ -127,8 +127,9 @@ def get_parsers(): parser['config_main'].add_argument( '-j', '--jobs', nargs='?', type=check_positive_int, - help=('Specify the maximum number of parallel jobs, currently ' - 'only global explorers are supported'), + help=('Specify the maximum number of parallel jobs. Global' + 'explorers, object prepare and object run are supported' + '(currently in beta'), action='store', dest='jobs', const=multiprocessing.cpu_count()) parser['config_main'].add_argument( diff --git a/docs/changelog b/docs/changelog index 33d056e7..1631b997 100644 --- a/docs/changelog +++ b/docs/changelog @@ -1,6 +1,9 @@ Changelog --------- +next: + * Core: Support -j parallelization for object prepare and object run (Darko Poljak) + 4.4.3: 2017-06-13 * Type __golang_from_vendor: Install golang from https://golang.org/dl/ (Kamila Součková) * Type __go_get: Install go packages using go get (Kamila Součková) diff --git a/docs/src/cdist-parallelization.rst b/docs/src/cdist-parallelization.rst index ce9f5bca..ed3afae9 100644 --- a/docs/src/cdist-parallelization.rst +++ b/docs/src/cdist-parallelization.rst @@ -11,8 +11,9 @@ with :strong:`-p/--parallel` option. The other way is to operate in parallel within one host where you specify the number of jobs. This is enabled with :strong:`-j/--jobs` option where you can specify the number of parallel jobs. By default, -:strong:`multiprocessing.cpu_count()` is used. For this mode only global -explorers are currently supported and this option is still in :strong:`beta`. +:strong:`multiprocessing.cpu_count()` is used. For this mode global explorers, +object preparation and object run are supported and this option is still in +:strong:`beta`. You can, of course, use those two options together. This means that each host will be processed by its own process. Within each process cdist will operate diff --git a/docs/src/man1/cdist.rst b/docs/src/man1/cdist.rst index 72cee4cc..a46e1e02 100644 --- a/docs/src/man1/cdist.rst +++ b/docs/src/man1/cdist.rst @@ -99,8 +99,9 @@ Configure/install one or more hosts. .. option:: -j [JOBS], --jobs [JOBS] - Specify the maximum number of parallel jobs; currently only - global explorers are supported (currently in beta) + Specify the maximum number of parallel jobs. Global + explorers, object prepare and object run are supported + (currently in beta). .. option:: -n, --dry-run