From 4e108069dacb5ca34a3c8af38028612ea0f80fb1 Mon Sep 17 00:00:00 2001 From: anwleung Date: Tue, 13 Mar 2007 22:45:30 +0000 Subject: [PATCH] Applying sages changes git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1229 29311d96-e01e-0410-9327-a35deaab8ce9 --- branches/aleung/security1/ceph/.groups | 1 + branches/aleung/security1/ceph/Makefile | 6 ++--- .../aleung/security1/ceph/client/Client.cc | 3 +-- branches/aleung/security1/ceph/jobs/sample.pl | 26 +++++++++++++------ branches/aleung/security1/ceph/mds/Locker.cc | 5 ++++ 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/branches/aleung/security1/ceph/.groups b/branches/aleung/security1/ceph/.groups index 146512a792c80..2a96f7b2268e8 100644 --- a/branches/aleung/security1/ceph/.groups +++ b/branches/aleung/security1/ceph/.groups @@ -1,3 +1,4 @@ 1000 1000 3500 -1 +100 3407 -1 1500 384 555 -1 1020 340 341 342 343 344 345 346 -1 \ No newline at end of file diff --git a/branches/aleung/security1/ceph/Makefile b/branches/aleung/security1/ceph/Makefile index ec581971e85b3..9a6d72f75625d 100644 --- a/branches/aleung/security1/ceph/Makefile +++ b/branches/aleung/security1/ceph/Makefile @@ -22,8 +22,8 @@ CFLAGS = -ggdb3 -Wall -I. -D_FILE_OFFSET_BITS=64 -DMPICH_IGNORE_CXX_SEEK -D_REEN LDINC = ar -rc else # For linux -CFLAGS = -ggdb3 -Wall -I. -D_FILE_OFFSET_BITS=64 -DMPICH_IGNORE_CXX_SEEK -D_REENTRANT -D_THREAD_SAFE -#CFLAGS = -O3 -Wall -I. -D_FILE_OFFSET_BITS=64 -DMPICH_IGNORE_CXX_SEEK -D_REENTRANT -D_THREAD_SAFE +#CFLAGS = -ggdb3 -Wall -I. -D_FILE_OFFSET_BITS=64 -DMPICH_IGNORE_CXX_SEEK -D_REENTRANT -D_THREAD_SAFE +CFLAGS = -ggdb3 -O3 -Wall -I. -D_FILE_OFFSET_BITS=64 -DMPICH_IGNORE_CXX_SEEK -D_REENTRANT -D_THREAD_SAFE LDINC = ld -i -o endif @@ -163,7 +163,7 @@ fakesyn: fakesyn.cc mon.o mds.o client.o osd.o ebofs.o ${OSBDB_OBJ} osdc.o msg/F # mpi startup newsyn: newsyn.cc mon.o mds.o client.o osd.o ebofs.o ${OSBDB_OBJ} osdc.o msg/SimpleMessenger.o common.o crypto.o - ${MPICC} -pg ${MPICFLAGS} $^ -o $@ ${MPILIBS} ${OSBDB_LIBS} + ${MPICC} ${MPICFLAGS} $^ -o $@ ${MPILIBS} ${OSBDB_LIBS} newsyn.nopg: newsyn.cc mon.o mds.o client.o osd.o ebofs.o ${OSBDB_OBJ} osdc.o msg/SimpleMessenger.o common.o crypto.o ${MPICC} ${MPICFLAGS} ${MPILIBS} ${OSBDB_LIBS} $^ -o $@ diff --git a/branches/aleung/security1/ceph/client/Client.cc b/branches/aleung/security1/ceph/client/Client.cc index 247ba8a35d5a1..1950c79bc69dc 100644 --- a/branches/aleung/security1/ceph/client/Client.cc +++ b/branches/aleung/security1/ceph/client/Client.cc @@ -150,7 +150,6 @@ Client::~Client() if (messenger) { delete messenger; messenger = 0; } } - void Client::tear_down_cache() { // fh's @@ -722,7 +721,7 @@ void Client::put_user_ticket(Ticket *tk) } void Client::handle_osd_update(MOSDUpdate *m) { - + hash_t my_hash = m->get_hash(); cout << "Client::handle_osd_request Received a request to resolve group " << my_hash << endl; diff --git a/branches/aleung/security1/ceph/jobs/sample.pl b/branches/aleung/security1/ceph/jobs/sample.pl index 0b1aa5596d033..89e193e1bf32d 100644 --- a/branches/aleung/security1/ceph/jobs/sample.pl +++ b/branches/aleung/security1/ceph/jobs/sample.pl @@ -2,14 +2,14 @@ # hi there { # startup - 'n' => 30, # number of mpi nodes + 'n' => 6, # number of mpi nodes 'sleep' => 3, # seconds to sleep between runs (so you have time to control-c out) 'nummds' => 1, - 'numosd' => 6, - 'numclient' => 100, + 'numosd' => 4, + 'numclient' => 5, 'until' => 100, # --syn until $n ... synthetic client will stop itself after this many seconds. - 'kill_after' => 300, # seconds before everything commits suicide (in case something hangs) + #'kill_after' => 300, # seconds before everything commits suicide (in case something hangs) # stuff i want to vary # here's a simple example: @@ -18,7 +18,8 @@ 'writefile' => 1, # and very the write size 'writefile_size' => [ # vary - #2048*1024, + 4096*1024, + 2048*1024, 1024*1024, 512*1024, 256*1024, @@ -36,13 +37,22 @@ #16, #1 ], - 'writefile_mb' => 1000, # each client shoudl write 1GB (or more likely, keep going until time runs out) + 'writefile_mb' => 100, # each client shoudl write 1GB (or more likely, keep going until time runs out) - 'file_layout_num_rep'=> [1,2], # also vary the replication level + #'file_layout_num_rep'=> [1,2], # also vary the replication level # pass some other random things to newsyn - 'custom' => '--', + #'custom' => '--', + + # varies security off and security on + 'secure_io' => [0, 1], + + 'mds_group' => [0, 1], + 'unix_group_file' => '.groups', + 'fix_client_id' => 1, + 'client_oc' => 0, + 'fs' => 'ebofs', # for final summation (script/sum.pl) # specify time period to look at the results 'start' => 30, # skip first 30 seconds, so that caches are full etc. diff --git a/branches/aleung/security1/ceph/mds/Locker.cc b/branches/aleung/security1/ceph/mds/Locker.cc index 361943b15f138..cb2c5e3cf9684 100644 --- a/branches/aleung/security1/ceph/mds/Locker.cc +++ b/branches/aleung/security1/ceph/mds/Locker.cc @@ -233,6 +233,11 @@ ExtCap* Locker::issue_new_extcaps(CInode *in, int mode, MClientRequest *req) { // issue most generic cap (RW) my_want |= FILE_MODE_RW; + utime_t clock_time_start = g_clock.now(); + utime_t test_time = g_clock.now(); + utime_t clock_time_end = g_clock.now(); + cout << "Clock time " << clock_time_end - clock_time_start << endl; + // check cache ExtCap *ext_cap; utime_t setup_time_end = g_clock.now(); -- 2.39.5