Merge branch 'master' into install
This commit is contained in:
Nico Schottelius
commit
3f2a27fa82
111 changed files with 1923 additions and 1679 deletions
12
doc/dev/benchmark-parallel-deploy
Executable file
12
doc/dev/benchmark-parallel-deploy
Executable file
|
|
@ -0,0 +1,12 @@
|
|||
#!/bin/sh
|
||||
|
||||
outfile="$1"; shift
|
||||
|
||||
(
|
||||
for host in "$@"; do
|
||||
hosts="$hosts $host"
|
||||
cdist config -c ~/p/cdist-nutzung -p $hosts 2>&1
|
||||
done
|
||||
) | tee "$outfile"
|
||||
echo "----------"
|
||||
grep 'INFO: Total processing time for' "$outfile" | sed 's/.*: //'
|
||||
24
doc/dev/lastchanges
Executable file
24
doc/dev/lastchanges
Executable file
|
|
@ -0,0 +1,24 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# 2011 Nico Schottelius (nico-cdist at schottelius.org)
|
||||
#
|
||||
# This file is part of cdist.
|
||||
#
|
||||
# cdist is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# cdist is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
#
|
||||
# Show the lastest changes from this (upcoming) release
|
||||
#
|
||||
|
||||
awk '/^$/ { exit } { print $0 } END { print "-----" }' < "${0%/*}/../changelog"
|
||||
56
doc/dev/logs/2011-04-27.benchmark
Normal file
56
doc/dev/logs/2011-04-27.benchmark
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
% x200
|
||||
data = [ 1 104; 2 129; 6 249 ; 25 1267 ]
|
||||
|
||||
% x201, 4.2.2.4 dns, eth
|
||||
data = [ 1 143; 2 159; 3 198; 4 244; 5 299; 6 350; 7 435; 8 429 ];
|
||||
|
||||
% x201, von zuhause aus
|
||||
data2 = [ 226 242 275 296 306 357 403 400 409 685 617 672 ]
|
||||
plot(0:size(data)(2)-1, data)
|
||||
|
||||
|
||||
hold off;
|
||||
plot(data(:,1), data(:,2))
|
||||
% per host time:
|
||||
data(:,2)' ./ data(:,1)'
|
||||
hold on;
|
||||
plot(data(:,1), data(:,2)' ./ data(:,1)')
|
||||
|
||||
|
||||
Testing on
|
||||
Intel(R) Core(TM)2 Duo CPU P8400 @ 2.26GHz
|
||||
4 GiB RAM
|
||||
Intel Gbit Nic
|
||||
|
||||
- 169 objects, all done (i.e. rerun)
|
||||
- runs are cpu bound
|
||||
|
||||
1 host:
|
||||
|
||||
core: cdist 1.6.2: Successfully finished run
|
||||
Run: 104s (1 minutes)
|
||||
|
||||
2 hosts:
|
||||
|
||||
[13:48] kr:cdist-nutzung% mytime cdist-mass-deploy -p ikq03.ethz.ch ikq04.ethz.ch
|
||||
Run: 129s (2 minutes)
|
||||
|
||||
6 hosts: (7 specified, but ikq01.ethz.ch is dead)
|
||||
cdist-mass-deploy -p ikq01.ethz.ch ikq02.ethz.ch ikq03.ethz.ch ikq04.ethz.ch ikq05.ethz.ch ikq06.ethz.ch ikq07.ethz.ch
|
||||
Run: 294s (4 minutes)
|
||||
|
||||
25 hosts
|
||||
|
||||
[13:58] kr:cdist-nutzung% mytime cdist-mass-deploy -p $(sed 's/^root@//' ~/.dsh/group/ikr)
|
||||
|
||||
Run: 723s (12 minutes)
|
||||
|
||||
|
||||
25 hosts without proxy command now:
|
||||
|
||||
Run: 1267s (21 minutes)
|
||||
Run: 1212s (20 minutes)
|
||||
|
||||
|
||||
[14:11] kr:cdist-nutzung% mytime cdist-mass-deploy -p $(sed 's/^root@//' ~/.dsh/group/ikr)
|
||||
|
||||
9
doc/dev/logs/2011-04-27.benchmark.dash
Normal file
9
doc/dev/logs/2011-04-27.benchmark.dash
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
Run: 78s (1 minutes)
|
||||
[13:25] kr:cdist-nutzung% mytime cdist-deploy-to ikq02.ethz.ch
|
||||
|
||||
% mit dash, eth, x201, Mit Apr 27 13:41:49 CEST 2011
|
||||
data = [ 0 73 77 89 107 130 151 180 197 228 251 260 199 295 335 276 ]
|
||||
plot(0:size(data2)(2)-1, data2)
|
||||
|
||||
|
||||
|
||||
4
doc/dev/logs/2011-09-08.obsolete_debugging
Normal file
4
doc/dev/logs/2011-09-08.obsolete_debugging
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
Debugging cdist:
|
||||
|
||||
[0:13] kr:cdist-nutzung% ./local/update-local-core && __cdist_debug=1 __cdist_local_base_dir=/tmp/cdist cdist-deploy-to ikq04.ethz.ch
|
||||
|
||||
110
doc/dev/logs/2011-09-12
Normal file
110
doc/dev/logs/2011-09-12
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
Benchmark from home/X201 (2 cores, 4 threads):
|
||||
|
||||
ikq (1): 72.192397
|
||||
ikq (2): INFO: Total processing time for 2 hosts: 74.1845
|
||||
ikq* (6): INFO: Total processing time: 117.572312
|
||||
ikq* + ikr3 (9): INFO: Total processing time: 120.307662
|
||||
ikq* + ikr (14): INFO: Total processing time: 139.769807
|
||||
ikq* + ikr (18): INFO: Total processing time: 186.354398
|
||||
ikq* + ikr (22): INFO: Total processing time: 225.793533
|
||||
ikq* + ikr (26): INFO: Total processing time: 237.06687
|
||||
ikq* + ikr (31): INFO: Total processing time: 276.912414
|
||||
|
||||
|
||||
ikr07.ethz.ch ikr09.ethz.ch ikr10.ethz.ch ikr11.ethz.ch
|
||||
ikr13.ethz.ch ikr14.ethz.ch ikr15.ethz.ch ikr16.ethz.ch
|
||||
ikr17.ethz.ch ikr19.ethz.ch ikr20.ethz.ch ikr21.ethz.ch
|
||||
ikr23.ethz.ch ikr24.ethz.ch ikr25.ethz.ch ikr26.ethz.ch
|
||||
ikr27.ethz.ch ikr28.ethz.ch ikr29.ethz.ch ikr30.ethz.ch
|
||||
ikr31.ethz.ch
|
||||
|
||||
cdist -c ~/p/cdist-nutzung -p ikq02.ethz.ch ikq03.ethz.ch ikq04.ethz.ch ikq05.ethz.ch ikq06.ethz.ch ikq07.ethz.ch ikr01.ethz.ch ikr02.ethz.ch ikr03.ethz.ch ikr05.ethz.ch ikr07.ethz.ch ikr09.ethz.ch ikr10.ethz.ch ikr11.ethz.ch ikr13.ethz.ch ikr14.ethz.ch ikr15.ethz.ch ikr16.ethz.ch ikr17.ethz.ch ikr19.ethz.ch ikr20.ethz.ch ikr21.ethz.ch
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
INFO: Total processing time for 1 hosts: 72.166661
|
||||
INFO: Total processing time for 2 hosts: 76.633228
|
||||
INFO: Total processing time for 3 host(s): 77.199817
|
||||
INFO: Total processing time for 4 host(s): 94.045175
|
||||
INFO: Total processing time for 5 host(s): 103.226354
|
||||
INFO: Total processing time for 6 host(s): 107.76097
|
||||
INFO: Total processing time for 7 host(s): 101.571705
|
||||
INFO: Total processing time for 8 host(s): 107.600093
|
||||
INFO: Total processing time for 9 host(s): 116.500371
|
||||
INFO: Total processing time for 10 host(s): 119.445805
|
||||
INFO: Total processing time for 11 host(s): 123.944385
|
||||
INFO: Total processing time for 12 host(s): 130.499098
|
||||
INFO: Total processing time for 13 host(s): 137.250861
|
||||
INFO: Total processing time for 14 host(s): 154.9841
|
||||
INFO: Total processing time for 15 host(s): 139.659637
|
||||
INFO: Total processing time for 16 host(s): 142.70005
|
||||
INFO: Total processing time for 17 host(s): 148.541452
|
||||
INFO: Total processing time for 18 host(s): 159.360809
|
||||
INFO: Total processing time for 19 host(s): 171.907864
|
||||
INFO: Total processing time for 20 host(s): 178.76695
|
||||
INFO: Total processing time for 21 host(s): 183.856671
|
||||
INFO: Total processing time for 22 host(s): 194.504221
|
||||
INFO: Total processing time for 23 host(s): 207.314842
|
||||
INFO: Total processing time for 24 host(s): 215.846502
|
||||
INFO: Total processing time for 25 host(s): 217.223581
|
||||
INFO: Total processing time for 26 host(s): 238.591705
|
||||
INFO: Total processing time for 27 host(s): 238.478493
|
||||
INFO: Total processing time for 28 host(s): 246.058718
|
||||
INFO: Total processing time for 29 host(s): 264.208372
|
||||
INFO: Total processing time for 30 host(s): 265.560685
|
||||
INFO: Total processing time for 31 host(s): 282.264488
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Use:
|
||||
grep "^INFO: Total processing time" doc/dev/logs/2011-09-12 | sed 's/.*: //'
|
||||
octave
|
||||
times = [ /* paste here ]
|
||||
plot(times)
|
||||
# keep the graph
|
||||
hold on
|
||||
# Scale linearly with the single host value
|
||||
plot((1:31)*times(1))
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
code:
|
||||
|
||||
octave
|
||||
time = [
|
||||
72.166661
|
||||
76.633228
|
||||
77.199817
|
||||
94.045175
|
||||
103.226354
|
||||
107.76097
|
||||
101.571705
|
||||
107.600093
|
||||
116.500371
|
||||
119.445805
|
||||
123.944385
|
||||
130.499098
|
||||
137.250861
|
||||
154.9841
|
||||
139.659637
|
||||
142.70005
|
||||
148.541452
|
||||
159.360809
|
||||
171.907864
|
||||
178.76695
|
||||
183.856671
|
||||
194.504221
|
||||
207.314842
|
||||
215.846502
|
||||
217.223581
|
||||
238.591705
|
||||
238.478493
|
||||
246.058718
|
||||
264.208372
|
||||
265.560685
|
||||
282.264488
|
||||
]
|
||||
plot(times, "-;cdist;", times(1)*[1:length(times)]', "-;linear;")
|
||||
title("Configuration duration (cdist-2.0.0-rc4)")
|
||||
ylabel("Number of hosts")
|
||||
xlabel("Time in seconds")
|
||||
print('cdist-2.0.0-rc4.png', '-dpng')
|
||||
|
||||
3
doc/dev/logs/2011-09-13
Normal file
3
doc/dev/logs/2011-09-13
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
Name for installer:
|
||||
installer (flag)
|
||||
$__installer (variable) - gesetzt oder nicht
|
||||
|
|
@ -5,26 +5,13 @@ Feel free to pick one!
|
|||
|
||||
CORE
|
||||
----
|
||||
- Inconsistent error messages if object is not existing!
|
||||
-> always use "Object undefined"
|
||||
- Add echo function / beautify output
|
||||
__cdist_echo [level] [messages...]
|
||||
level := syslog alike:
|
||||
debug, notice, err
|
||||
Include object_self prefixing, if given!
|
||||
- Think about moving cdist-type-build-emulation out of cdist-manifest-run to
|
||||
cdist-deploy-to: more dependency of cdist-manifest-run, but a lot of
|
||||
less cycles consumed
|
||||
|
||||
- cdist-object-gencode: remove code if output empty?
|
||||
- also take care of that in cdist-code-run!
|
||||
- Remove cdist-object-push, covers only one line and is used only once:
|
||||
[20:22] kr:bin% grep cdist-object-push *
|
||||
cdist-object-run: cdist-object-push "$__cdist_target_host" "$__cdist_object"
|
||||
[20:22] kr:bin%
|
||||
|
||||
- probably remove or improve cdist-type-template
|
||||
- add $__tmp?
|
||||
- allow cdist to run without $PATH setup: ./bin/cdist-deploy-to
|
||||
- support non-ssh access?
|
||||
|
||||
USER INTERFACE
|
||||
--------------
|
||||
- add support $__tmp?
|
||||
- for use in manifest, code, etc.?
|
||||
- for creating temporary files, etc.
|
||||
|
||||
|
|
@ -36,18 +23,11 @@ CORE
|
|||
-> for current host
|
||||
-> add function to cdist-config, import from cdist-cache
|
||||
|
||||
- check all all internal variables are prefixed with __cdist
|
||||
- Define / document "this is what should be on host X"
|
||||
and have it parsable by different (shinken) tool
|
||||
-> given after manifest run already!
|
||||
|
||||
- Allow types to have parameters without values (boolean flags).
|
||||
e.g. __chair fancychair --pink --wood
|
||||
would result in:
|
||||
$__object/parameter/
|
||||
pink # empty file
|
||||
wood # empty file
|
||||
|
||||
- use absent/present for state by default?
|
||||
|
||||
TYPES
|
||||
------
|
||||
|
|
@ -64,5 +44,3 @@ DOCUMENTATION
|
|||
- asciidoc interprets __, which we use for variables
|
||||
names -> seek through docs and replace with \_\_!
|
||||
- reference explorers in cdist-reference!
|
||||
- compare running times:
|
||||
one, 5, 10, 50, 100, 1000 hosts => how does cdist scale?
|
||||
|
|
|
|||
|
|
@ -1 +1,18 @@
|
|||
Catch broken instances in cdist-mass-deploy -p and report broken deployements at the end!
|
||||
- Support parallel execution
|
||||
- and maximum number of parallel runs (-p X)
|
||||
- error handling / report failed hosts
|
||||
- Support different home instead of ../
|
||||
- Bug: os.path.join() may be wrong for the remote side!
|
||||
-> does not matter for now!
|
||||
|
||||
- Rewrite cdist-type-emulator
|
||||
- Remove legacy code in cdist
|
||||
- Remove cdist-config
|
||||
- Remove man1/cdist-type-emulator.text
|
||||
- Remove the PATH=... part from the README
|
||||
|
||||
- Replace bin/cdist-type-template
|
||||
|
||||
- Allow manifest to be read from stdin
|
||||
- Create new video for cdist 2.0.0
|
||||
http://www.youtube.com/watch?v=PRMjzy48eTI
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue