Revision ad756c77
b/lib/cmdlib/cluster.py | ||
---|---|---|
1331 | 1331 |
# we need to update the pool size here, otherwise the save will fail |
1332 | 1332 |
AdjustCandidatePool(self, [], feedback_fn) |
1333 | 1333 |
|
1334 |
if self.op.max_running_jobs is not None: |
|
1335 |
self.cluster.max_running_jobs = self.op.max_running_jobs |
|
1336 |
|
|
1334 | 1337 |
if self.op.maintain_node_health is not None: |
1335 | 1338 |
if self.op.maintain_node_health and not constants.ENABLE_CONFD: |
1336 | 1339 |
feedback_fn("Note: CONFD was disabled at build time, node health" |
b/src/Ganeti/OpCodes.hs | ||
---|---|---|
215 | 215 |
, pClusterOsParams |
216 | 216 |
, pDiskParams |
217 | 217 |
, pCandidatePoolSize |
218 |
, pMaxRunningJobs |
|
218 | 219 |
, pUidPool |
219 | 220 |
, pAddUids |
220 | 221 |
, pRemoveUids |
b/src/Ganeti/OpParams.hs | ||
---|---|---|
119 | 119 |
, pClusterOsParams |
120 | 120 |
, pInstOsParams |
121 | 121 |
, pCandidatePoolSize |
122 |
, pMaxRunningJobs |
|
122 | 123 |
, pUidPool |
123 | 124 |
, pAddUids |
124 | 125 |
, pRemoveUids |
... | ... | |
628 | 629 |
withDoc "Master candidate pool size" . |
629 | 630 |
optionalField $ simpleField "candidate_pool_size" [t| Positive Int |] |
630 | 631 |
|
632 |
pMaxRunningJobs :: Field |
|
633 |
pMaxRunningJobs = |
|
634 |
withDoc "Maximal number of jobs to run simultaneously" . |
|
635 |
optionalField $ simpleField "max_running_jobs" [t| Positive Int |] |
|
636 |
|
|
631 | 637 |
pUidPool :: Field |
632 | 638 |
pUidPool = |
633 | 639 |
withDoc "Set UID pool, must be list of lists describing UID ranges\ |
b/test/hs/Test/Ganeti/OpCodes.hs | ||
---|---|---|
176 | 176 |
genMaybe genEmptyContainer <*> emptyMUD <*> |
177 | 177 |
genMaybe genEmptyContainer <*> genMaybe genEmptyContainer <*> |
178 | 178 |
genMaybe genEmptyContainer <*> genMaybe arbitrary <*> |
179 |
genMaybe arbitrary <*> |
|
179 | 180 |
arbitrary <*> arbitrary <*> arbitrary <*> |
180 | 181 |
arbitrary <*> arbitrary <*> arbitrary <*> |
181 | 182 |
emptyMUD <*> emptyMUD <*> arbitrary <*> |
Also available in: Unified diff