From 91a04b0d06e8f30ec4d9ea6a11c6d01fd6be7836 Mon Sep 17 00:00:00 2001 From: sage Date: Fri, 17 Feb 2006 20:14:16 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@651 29311d96-e01e-0410-9327-a35deaab8ce9 --- ceph/config.cc | 20 +++++++++++++++++++- ceph/script/runset.pl | 5 ++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ceph/config.cc b/ceph/config.cc index 7d264b6e28a3f..10d332c73648c 100644 --- a/ceph/config.cc +++ b/ceph/config.cc @@ -77,7 +77,6 @@ md_config_t g_conf = { tcp_serial_marshall: true, tcp_serial_out: false, - // --- client --- client_cache_size: 300, client_cache_mid: .5, @@ -445,6 +444,25 @@ void parse_config_options(vector& args) else if (strcmp(args[i], "--tick") == 0) g_conf.tick = atoi(args[++i]); + else if (strcmp(args[i], "--file_layout_ssize") == 0) + g_OSD_FileLayout.stripe_size = atoi(args[++i]); + else if (strcmp(args[i], "--file_layout_scount") == 0) + g_OSD_FileLayout.stripe_count = atoi(args[++i]); + else if (strcmp(args[i], "--file_layout_osize") == 0) + g_OSD_FileLayout.object_size = atoi(args[++i]); + else if (strcmp(args[i], "--meta_dir_layout_ssize") == 0) + g_OSD_MDDirLayout.stripe_size = atoi(args[++i]); + else if (strcmp(args[i], "--meta_dir_layout_scount") == 0) + g_OSD_MDDirLayout.stripe_count = atoi(args[++i]); + else if (strcmp(args[i], "--meta_dir_layout_osize") == 0) + g_OSD_MDDirLayout.object_size = atoi(args[++i]); + else if (strcmp(args[i], "--meta_log_layout_ssize") == 0) + g_OSD_MDLogLayout.stripe_size = atoi(args[++i]); + else if (strcmp(args[i], "--meta_log_layout_scount") == 0) + g_OSD_MDLogLayout.stripe_count = atoi(args[++i]); + else if (strcmp(args[i], "--meta_log_layout_osize") == 0) + g_OSD_MDLogLayout.object_size = atoi(args[++i]); + else { nargs.push_back(args[i]); } diff --git a/ceph/script/runset.pl b/ceph/script/runset.pl index a38d19d31b254..3aece352e659d 100755 --- a/ceph/script/runset.pl +++ b/ceph/script/runset.pl @@ -167,7 +167,10 @@ sub run { for my $k ('nummds', 'numclient', 'numosd', 'kill_after', 'osd_maxthreads', 'osd_object_layout', 'osd_pg_layout','osd_pg_bits', 'bdev_el_bidir', 'ebofs_idle_commit_ms', 'ebofs_commit_ms', - 'ebofs_oc_size','ebofs_cc_size','ebofs_bc_size','ebofs_bc_max_dirty','ebofs_abp_max_alloc') { + 'ebofs_oc_size','ebofs_cc_size','ebofs_bc_size','ebofs_bc_max_dirty','ebofs_abp_max_alloc', + 'file_layout_ssize','file_layout_scount','file_layout_osize', + 'meta_dir_layout_ssize','meta_dir_layout_scount','meta_dir_layout_osize', + 'meta_log_layout_ssize','meta_log_layout_scount','meta_log_layout_osize') { $c .= " --$k $h->{$k}" if defined $h->{$k}; } -- 2.39.5