RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 09:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: split objectcacher test into 'stress' and 'correctness'

Browse Source 
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
This commit is contained in:
Greg Farnum 2016-05-31 16:18:19 -07:00
parent ed5801492b
commit cc9aab1b0a
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/workunits/osdc/stress_objectcacher.sh
View File

@ -14,7 +14,7 @@ do
do
for MAX_DIRTY in 0 25165824
do
ceph_test_objectcacher_stress --ops $OPS --percent-read $READS --delay-ns $DELAY --objects $OBJECTS --max-op-size $OP_SIZE --client-oc-max-dirty $MAX_DIRTY > /dev/null 2>&1
ceph_test_objectcacher_stress --ops $OPS --percent-read $READS --delay-ns $DELAY --objects $OBJECTS --max-op-size $OP_SIZE --client-oc-max-dirty $MAX_DIRTY --stress-test > /dev/null 2>&1
done
done
done
@ -23,4 +23,6 @@ do
done
done
ceph_test_objectcacher_stress --correctness-test > /dev/null 2>&1
echo OK

34
src/test/osdc/object_cacher_stress.cc
View File

@ -21,6 +21,7 @@
#include "osdc/ObjectCacher.h"
#include "FakeWriteback.h"
#include "MemWriteback.h"
// XXX: Only tests default namespace
struct op_data {
@ -173,6 +174,24 @@ int stress_test(uint64_t num_ops, uint64_t num_objs,
return EXIT_SUCCESS;
}
int correctness_test(uint64_t delay_ns)
{
Mutex lock("object_cacher_stress::object_cacher");
MemWriteback writeback(g_ceph_context, &lock, delay_ns);
ObjectCacher obc(g_ceph_context, "test", writeback, lock, NULL, NULL,
g_conf->client_oc_size,
g_conf->client_oc_max_objects,
g_conf->client_oc_max_dirty,
g_conf->client_oc_target_dirty,
g_conf->client_oc_max_dirty_age,
true);
obc.start();
std::cout << "Testing ObjectCacher correctness" << std::endl;
return 0;
}
int main(int argc, const char **argv)
{
std::vector<const char*> args;
@ -187,6 +206,8 @@ int main(int argc, const char **argv)
long long num_objs = 10;
float percent_reads = 0.90;
int seed = time(0) % 100000;
bool stress = false;
bool correctness = false;
std::ostringstream err;
std::vector<const char*>::iterator i;
for (i = args.begin(); i != args.end();) {
@ -225,12 +246,21 @@ int main(int argc, const char **argv)
cerr << argv[0] << ": " << err.str() << std::endl;
return EXIT_FAILURE;
}
} else if (ceph_argparse_flag(args, i, "--stress-test", NULL)) {
stress = true;
} else if (ceph_argparse_flag(args, i, "--correctness-test", NULL)) {
correctness = true;
} else {
cerr << "unknown option " << *i << std::endl;
return EXIT_FAILURE;
}
}
srandom(seed);
return stress_test(num_ops, num_objs, obj_bytes, delay_ns, max_len, percent_reads);
if (stress) {
srandom(seed);
return stress_test(num_ops, num_objs, obj_bytes, delay_ns, max_len, percent_reads);
}
if (correctness) {
return correctness_test(delay_ns);
}
}