Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rbd: switched from legacy to new-style configuration options #16737

Merged
merged 1 commit into from Aug 9, 2017

Conversation

dillaman
Copy link

@dillaman dillaman commented Aug 1, 2017

Signed-off-by: Jason Dillaman dillaman@redhat.com

@dillaman
Copy link
Author

dillaman commented Aug 1, 2017

Will move documentation over to schema once PR #16735 merges

@dillaman dillaman changed the title [DNM] rbd: switched from legacy to new-style configuration options rbd: switched from legacy to new-style configuration options Aug 7, 2017
@@ -164,7 +164,6 @@ TEST_F(TestJournalEntries, AioDiscard) {
REQUIRE_FEATURE(RBD_FEATURE_JOURNALING);

CephContext* cct = reinterpret_cast<CephContext*>(_rados.cct());
REQUIRE(!cct->_conf->rbd_skip_partial_discard);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dillaman cct variable is unused now. But I think we still need to skip the test when partial discard is enabled, due to journal events are optimized out for empty objects. See our discussion here: #10060 (comment)

% CEPH_ARGS='--rbd_skip_partial_discard=true' RBD_FEATURES=109 CEPH_LIB=./lib ./bin/unittest_librbd --gtest_filter=TestJournalEntries.AioDiscard
Note: Google Test filter = TestJournalEntries.AioDiscard
[==========] Running 1 test from 1 test case.
[----------] Global test environment set-up.
[----------] 1 test from TestJournalEntries
[ RUN      ] TestJournalEntries.AioDiscard
/home/mgolub/ceph.ci/src/test/librbd/journal/test_Entries.cc:181: Failure
Value of: wait_for_entries_available(ictx)
  Actual: false
Expected: true
[  FAILED  ] TestJournalEntries.AioDiscard (10018 ms)
[----------] 1 test from TestJournalEntries (10018 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test case ran. (10047 ms total)
[  PASSED  ] 0 tests.
[  FAILED  ] 1 test, listed below:
[  FAILED  ] TestJournalEntries.AioDiscard

 1 FAILED TEST

@dillaman
Copy link
Author

dillaman commented Aug 9, 2017

@trociny update pushed

@trociny
Copy link
Contributor

trociny commented Aug 9, 2017

@dillaman It needs update after #15579 merge.

/home/mgolub/ceph.ci/src/tools/rbd/action/List.cc: In function ‘int rbd::action::list::execute(const boost::program_options::variables_map&)’:
/home/mgolub/ceph.ci/src/tools/rbd/action/List.cc:293:57: error: ‘struct md_config_t’ has no member named ‘rbd_concurrent_management_ops’
   r = do_list(pool_name, vm["long"].as<bool>(), g_conf->rbd_concurrent_management_ops, formatter.get());

Copy link
Contributor

@smithfarm smithfarm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes: http://tracker.ceph.com/issues/20737

?

@smithfarm
Copy link
Contributor

please link with tracker if appropriate

@dillaman
Copy link
Author

dillaman commented Aug 9, 2017

rebase pushed

Copy link
Contributor

@trociny trociny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@trociny trociny merged commit 651b378 into ceph:master Aug 9, 2017
@dillaman dillaman deleted the wip-rbd-config branch August 9, 2017 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants