*** empty log message ***

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

diff --git a/ceph/jobs/rados/map_dist b/ceph/jobs/rados/map_dist
index 39f16daa1cdc273d8d74caa8ff8ff2cb2ec034fc..02173f5767baa63caa488b015d104c4993c403e4 100644 (file)
--- a/ceph/jobs/rados/map_dist
+++ b/ceph/jobs/rados/map_dist
@@ -4,7 +4,7 @@
 {
        'sleep' => 3,
 
-       'osdbits' => [6,7,8],#,9],10,11],
+       'osdbits' => [6,7,8,9,10],#,9],10,11],
        'pgperbits' => [3],#,4,5],#[4,6,8],
 
        'nummds' => 1,

diff --git a/ceph/jobs/rados/wr_sizes b/ceph/jobs/rados/wr_sizes
index 4813e29b78f791d04b3de9ffdeb8a41865f48887..8b96fe6041208d2906f61b0a426b3040e874a8ab 100644 (file)
--- a/ceph/jobs/rados/wr_sizes
+++ b/ceph/jobs/rados/wr_sizes
@@ -5,11 +5,11 @@
        'sleep' => 3,
 
        'nummds' => 1,
-       'numosd' => [10,14],#10,14,16],
-       'numclient' => [30*16],
-       'n' => 27,
+       'numosd' => [8],#10,14,16],
+       'numclient' => [10*16],
+       'n' => 13,
 
-       'fs' => ['ebofs'],
+       'fs' => 'ebofs',
 
        'start' => 60,
        'end' => 90,
@@ -30,12 +30,14 @@
                                                 1024*1024],
        'writefile_mb' => 10000,
 
-       'file_layout_num_rep' => [1, 2, 3],
+       'file_layout_num_rep' => 1,
        'file_layout_ssize' => 4*1024*1024,
        'file_layout_osize' => 4*1024*1024,
 
        'osd_pg_bits' => 12,
 
+       'ebofs_freelist' => [0, 1080, 65400],
+
 
                #'custom' => '--tcp_skip_rank0',
 

diff --git a/ceph/script/runset.pl b/ceph/script/runset.pl
index ba81cf91e917281d2398809f5de044164b8f8c57..ed578a39bee82516c276c3fcf0492b890e4b017e 100755 (executable)
--- a/ceph/script/runset.pl
+++ b/ceph/script/runset.pl
@@ -205,6 +205,11 @@ sub run {
        $c .= " --syn readfile $h->{'readfile_mb'} $h->{'readfile_size'}" if $h->{'readfile'};
        $c .= " --syn makedirs $h->{'makedirs_dirs'} $h->{'makedirs_files'} $h->{'makedirs_depth'}" if $h->{'makedirs'};
 
+       if ($h->{'ebofs_freelist'}) {
+               system "cp freelist/ebofs.freelist.$h->{'ebofs_freelist'} ebofs.freelist";
+               $c .= " --osd_age_time -1";
+       }
+
        for my $k ('nummds', 'numclient', 'numosd', 'kill_after',
                           'osd_maxthreads', 'osd_object_layout', 'osd_pg_layout','osd_pg_bits',
                           'mds_bal_rep', 'mds_bal_interval', 'mds_bal_max','mds_decay_halflife',
@@ -267,7 +272,8 @@ touch $fn/.post
                return;
        } else {
                # run
-               my $cmd = "\n$launch $c > $fn/o && touch $fn/.done";
+               #my $cmd = "\n$launch $c > $fn/o && touch $fn/.done";#
+               my $cmd = "\n$launch $c > $fn/o ; touch $fn/.done";
                print "$cmd $nobg\n";
                my $r = undef;
                unless ($fake) {