*** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@697 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/jobs/alc.tp b/ceph/jobs/alc.tp
index e5ae19621d2fc9f621d8138d8f9e6063384da385..c600850c54be059369564778a5d2ef60d7029f32 100644 (file)
--- a/ceph/jobs/alc.tp
+++ b/ceph/jobs/alc.tp
@@ -7,13 +7,13 @@
 #PSUB -g   $NUM       # Total Number of tasks to use
 #PSUB -cpn 1       # cpus per node
 
-####PSUB -c 1024Mb     # 128Mb memory limit
-#PSUB -lc 1000        # Core file size per process
+####PSUB -c 1024Mb     # memory limit
+#PSUB -lc 1500        # Core file size per process
 #PSUB -nr          # Do not automatically resubmit job
-#PSUB -tM 10m      # Select time limit. The default time limit
+#PSUB -tM 20m      # Select time limit. The default time limit
                    # is only 30 minutes! Time can be HH:MM:SS or HH:MM
 
-#PSUB -o /home/weil2/csl/obsd/src/pmds/$OUT   # filename for output
+#PSUB -o $CWD/$OUT   # filename for output
 
 # Put your commands here. Remember to 'cd' to the appropriate
 # directory, because the job will initially be in your home directory.
@@ -24,15 +24,15 @@
 echo job $PSUB_JOBID nodes $NUM name $NAME
 
 # environment
-cd /home/weil2/csl/obsd/src/pmds
+cd $CWD
 export LD_LIBRARY_PATH=/usr/lib/mpi/mpi_gnu/lib
 
 # create fakestore dirs
-srun -l -N $NUM -ppbatch bash -c "test -d tmp/osddata || mkdir tmp/osddata || echo cant make osddata"
+srun -l -N $NUM -ppbatch bash -c "test -d tmp/osddata || mkdir tmp/osddata || echo cant make osddata  ; uptime"
 
 # go
-srun -l -N $NUM -ppbatch $CMD
+srun -l -N $NUM -ppbatch $CMD && touch $DONE
 
 # clean up fakestore
-srun -l -N $NUM -ppbatch bash -c 'rm -r tmp/osddata/*'
+srun -l -N $NUM -ppbatch bash -c 'uptime ; rm -r tmp/osddata/*'
 

diff --git a/ceph/jobs/alcdat/openssh b/ceph/jobs/alcdat/openssh
index 4f2eb164185460f941a8d7ddab6b7881948d61cd..de7567080c1fe1db396a43548024ab715848441d 100644 (file)
--- a/ceph/jobs/alcdat/openssh
+++ b/ceph/jobs/alcdat/openssh
@@ -8,18 +8,18 @@
 
        'trace' => ['make','make.lib','make.include'],
 
-       'cper' => 50,
+       'cper' => [ 50, 100 ],
        '_dep' => [ 'cnode' => '$nummds',
                                'numclient' => '$cnode * $cper',
                                'numosd' => '$nummds * 2',
                                'n' => '1 + $cnode + $nummds + $numosd',
-                               'custom' => '--tcp_skip_rank0 --mds_shutdown_check 60 --syn only 0 --syn trace traces/openssh/untar.lib 1 --syn only 1 --syn trace traces/openssh/untar.include 1 --syn randomsleep 30 --syn trace traces/openssh/$trace 1000' ],
+                               'custom' => '"--tcp_skip_rank0 --mds_shutdown_check 60 --syn only 0 --syn trace traces/openssh/untar.lib 1 --syn only 1 --syn trace traces/openssh/untar.include 1 --syn randomsleep 30 --syn trace traces/openssh/$trace 1000"' ],
        
        # parameters
        #'fs' => 'ebofs',
        'fs' => 'fakestore',
 
-       'until' => 500,     # --syn until $n    ... when to stop clients
+       'until' => 500,   
        'kill_after' => 600,
        'start' => 200,
        'end' => 500,

diff --git a/ceph/jobs/mds/makedirs b/ceph/jobs/mds/makedirs
index f0fec65df6a18e33f50d527e202fcf2d2ea7677f..4ca42d72fa37eda948f1a833a1e8896c3a701a19 100644 (file)
--- a/ceph/jobs/mds/makedirs
+++ b/ceph/jobs/mds/makedirs
@@ -2,9 +2,11 @@
 
 # hi there
 {
+       '_psub' => 'jobs/alc.tp',
+
        'sleep' => 3,
 
-       'nummds' => [1, 2, 4, 6],
+       'nummds' => [1, 2, 4, 6, 8, 12, 16, 24, 32, 40, 48, 64],
 
        'cper' => 50,
        '_dep' => [ 'cnode' => '$nummds',
@@ -13,7 +15,8 @@
                                'n' => '1 + $cnode + $nummds + $numosd' ],
        
        # parameters
-       'fs' => 'ebofs',
+       #'fs' => 'ebofs',
+       'fs' => 'fakestore',
 
        'until' => 300,     # --syn until $n    ... when to stop clients
        'kill_after' => 400,

diff --git a/ceph/jobs/osd/mds_log b/ceph/jobs/osd/mds_log
index 819b1b93f3199d14601d0cb8ac45228886263c16..0f99f6998dcfc01529387a3000fadcddee1d249c 100644 (file)
--- a/ceph/jobs/osd/mds_log
+++ b/ceph/jobs/osd/mds_log
@@ -2,27 +2,30 @@
 
 # hi there
 {
+       #'_psub' => 'jobs/alc.tp',
        'sleep' => 3,
 
        'nummds' => 1,
        'numclient' => [5, 10, 15, 25, 50, 100, 200, 300, 400],
        #'numclient' => [ 50, 100, 200 ],
-       'numosd' => 24,#[ 4, 8, 12, 16, 20, 24 ], 
-       'n' => 31,
-       
+       'numosd' => [2,4],#[ 4, 8, 12, 16, 20, 24 ], 
+       'n' => 12,
+
        # parameters
-       'fs' => ['ebofs', 'fakestore','obfs'],
+       'fs' => 'fakestore',#['ebofs', 'fakestore','obfs'],
        #'fs' => 'ebofs',
        #'ebofs_commit_ms' => [ 1000, 5000 ],
        #'osd_maxthreads' => [ 0, 1, 2, 4, 8 ],
 
        'until' => 100,     # --syn until $n    ... when to stop clients
-       'kill_after' => 600,
+       'kill_after' => 300,
+       'start' => 20,
+       'end' => 90,
        
-       #'makedirs' => 1,
-       #'makedirs_dirs' => 10,
-       #'makedirs_files' => 10,
-       #'makedirs_depth' => 3,
+       'makedirs' => 1,
+       'makedirs_dirs' => 10,
+       'makedirs_files' => 10,
+       'makedirs_depth' => 3,
                
 
        #'meta_log_layout_ssize' => [256, 512, 1024, 4096, 16384, 65536, 262400],
@@ -30,13 +33,9 @@
        #'meta_log_layout_num_rep' => [1, 2],
        #'meta_log_layout_num_rep' => 1,
 
-       'custom' => '--tcp_skip_rank0 --mds_shutdown_check 60 --syn trace traces/trace.openssh 10',
+       'custom' => '--tcp_skip_rank0 --mds_shutdown_check 60',
        #'custom' => '--debug_after 110 --debug_osd 15 --debug_filer 15 --debug 5',
        
-       # for final summation (script/sum.pl)
-       'start' => 20,
-       'end' => 90,
-
        'comb' => {
                'x' => 'numclient',#'meta_log_layout_ssize',
                'vars' => [ 'mds.req' ]