diff options
| author | Sage Weil <sage@inktank.com> | 2013-10-15 13:46:25 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-10-15 13:46:25 -0700 |
| commit | ee480d868538d702a8624d592a89adef221a0588 (patch) | |
| tree | 5dc8f1a3ebc486f38fb79b5fd62b1f409efcc430 | |
| parent | ab8f9b17d6ec82a0772e98c19a029b85e079fcf3 (diff) | |
| parent | f0805cb61fccf9ffaa905b8477a131b4d46379fa (diff) | |
| download | ceph-ee480d868538d702a8624d592a89adef221a0588.tar.gz | |
Merge pull request #542 from ceph/wip-6122
test/librados/cmd.cc: tolerate thrashing on pg_command tests
| -rw-r--r-- | src/test/librados/cmd.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/test/librados/cmd.cc b/src/test/librados/cmd.cc index 71343f2b908..a822f558e05 100644 --- a/src/test/librados/cmd.cc +++ b/src/test/librados/cmd.cc @@ -100,8 +100,9 @@ TEST(LibRadosCmd, PGCmd) { string pgid = stringify(poolid) + ".0"; cmd[0] = (char *)"asdfasdf"; - ASSERT_EQ(-22, rados_pg_command(cluster, pgid.c_str(), (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen)); - + // note: tolerate NXIO here in case the cluster is thrashing out underneath us. + r = rados_pg_command(cluster, pgid.c_str(), (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen); + ASSERT_TRUE(r == -22 || r == -ENXIO); // make sure the pg exists on the osd before we query it rados_ioctx_t io; @@ -114,7 +115,9 @@ TEST(LibRadosCmd, PGCmd) { string qstr = "{\"prefix\":\"pg\", \"cmd\":\"query\", \"pgid\":\"" + pgid + "\"}"; cmd[0] = (char *)qstr.c_str(); - ASSERT_EQ(0, rados_pg_command(cluster, pgid.c_str(), (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen)); + // note: tolerate ENOENT/ENXIO here if hte osd is thrashing out underneath us + r = rados_pg_command(cluster, pgid.c_str(), (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen); + ASSERT_TRUE(r == 0 || r == -ENOENT || r == -ENXIO); ASSERT_LT(0u, buflen); rados_buffer_free(buf); |