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
common/Throttle.{cc,h} unit tests #34
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,283 @@ | ||
// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- | ||
// vim: ts=8 sw=2 smarttab | ||
/* | ||
* Ceph - scalable distributed file system | ||
* | ||
* Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com> | ||
* | ||
* Author: Loic Dachary <loic@dachary.org> | ||
* | ||
* This program is free software; you can redistribute it and/or modify | ||
* it under the terms of the GNU Library Public License as published by | ||
* the Free Software Foundation; either version 2, or (at your option) | ||
* any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Library Public License for more details. | ||
* | ||
*/ | ||
|
||
#include <stdio.h> | ||
#include <signal.h> | ||
#include "common/Mutex.h" | ||
#include "common/Thread.h" | ||
#include "common/Throttle.h" | ||
#include "test/unit.h" | ||
|
||
#define dout_subsys ceph_subsys_throttle | ||
|
||
//#define TEST_DEBUG 20 | ||
#define TEST_DEBUG 0 | ||
|
||
class ThrottleTest : public ::testing::Test { | ||
protected: | ||
|
||
virtual void SetUp() { | ||
g_ceph_context->_conf->subsys.set_log_level(dout_subsys, TEST_DEBUG); | ||
} | ||
|
||
class Thread_get : public Thread { | ||
public: | ||
Throttle &throttle; | ||
int64_t count; | ||
bool waited; | ||
|
||
Thread_get(Throttle& _throttle, int64_t _count) : | ||
throttle(_throttle), | ||
count(_count), | ||
waited(false) | ||
{ | ||
} | ||
|
||
virtual void *entry() { | ||
waited = throttle.get(count); | ||
throttle.put(count); | ||
return NULL; | ||
} | ||
}; | ||
|
||
}; | ||
|
||
TEST_F(ThrottleTest, Throttle) { | ||
ASSERT_THROW({ | ||
Throttle throttle(g_ceph_context, "throttle", -1); | ||
}, FailedAssertion); | ||
|
||
int64_t throttle_max = 10; | ||
Throttle throttle(g_ceph_context, "throttle", throttle_max); | ||
ASSERT_EQ(throttle.get_max(), throttle_max); | ||
ASSERT_EQ(throttle.get_current(), 0); | ||
} | ||
|
||
TEST_F(ThrottleTest, destructor) { | ||
Thread_get *t; | ||
{ | ||
int64_t throttle_max = 10; | ||
Throttle *throttle = new Throttle(g_ceph_context, "throttle", throttle_max); | ||
|
||
ASSERT_FALSE(throttle->get(5)); | ||
|
||
t = new Thread_get(*throttle, 7); | ||
t->create(); | ||
bool blocked; | ||
useconds_t delay = 1; | ||
do { | ||
usleep(delay); | ||
if(throttle->get_or_fail(1)) { | ||
throttle->put(1); | ||
blocked = false; | ||
} else { | ||
blocked = true; | ||
} | ||
delay *= 2; | ||
} while(!blocked); | ||
delete throttle; | ||
} | ||
|
||
{ // | ||
// The thread is left hanging, otherwise it will abort(). | ||
// Deleting the Throttle on which it is waiting creates a | ||
// inconsistency that will be detected: the Throttle object that | ||
// it references no longer exists. | ||
// | ||
pthread_t id = t->get_thread_id(); | ||
ASSERT_EQ(pthread_kill(id, 0), 0); | ||
delete t; | ||
ASSERT_EQ(pthread_kill(id, 0), 0); | ||
} | ||
} | ||
|
||
TEST_F(ThrottleTest, take) { | ||
int64_t throttle_max = 10; | ||
Throttle throttle(g_ceph_context, "throttle", throttle_max); | ||
ASSERT_THROW(throttle.take(-1), FailedAssertion); | ||
ASSERT_EQ(throttle.take(throttle_max), throttle_max); | ||
ASSERT_EQ(throttle.take(throttle_max), throttle_max * 2); | ||
} | ||
|
||
TEST_F(ThrottleTest, get) { | ||
int64_t throttle_max = 10; | ||
Throttle throttle(g_ceph_context, "throttle", throttle_max); | ||
ASSERT_THROW(throttle.get(-1), FailedAssertion); | ||
ASSERT_FALSE(throttle.get(5)); | ||
ASSERT_EQ(throttle.put(5), 0); | ||
|
||
ASSERT_FALSE(throttle.get(throttle_max)); | ||
ASSERT_FALSE(throttle.get_or_fail(1)); | ||
ASSERT_FALSE(throttle.get(1, throttle_max + 1)); | ||
ASSERT_EQ(throttle.put(throttle_max + 1), 0); | ||
ASSERT_FALSE(throttle.get(0, throttle_max)); | ||
ASSERT_FALSE(throttle.get(throttle_max)); | ||
ASSERT_FALSE(throttle.get_or_fail(1)); | ||
ASSERT_EQ(throttle.put(throttle_max), 0); | ||
|
||
useconds_t delay = 1; | ||
|
||
bool waited; | ||
|
||
do { | ||
cout << "Trying (1) with delay " << delay << "us\n"; | ||
|
||
ASSERT_FALSE(throttle.get(throttle_max)); | ||
ASSERT_FALSE(throttle.get_or_fail(throttle_max)); | ||
|
||
Thread_get t(throttle, 7); | ||
t.create(); | ||
usleep(delay); | ||
ASSERT_EQ(throttle.put(throttle_max), 0); | ||
t.join(); | ||
|
||
if(!(waited = t.waited)) | ||
delay *= 2; | ||
} while(!waited); | ||
|
||
// | ||
// | ||
// When a get() is waiting, the others will be added to a list, | ||
// first come first served. The desired sequence is: | ||
// | ||
// get 5 (0 -> 5) | ||
// get_or_fail 10 failed | ||
// get 10 (5 -> 15) | ||
// _wait waiting... | ||
// get 1 (5 -> 6) | ||
// _wait waiting... | ||
// put 5 (5 -> 0) | ||
// _wait finished waiting | ||
// put 10 (10 -> 0) | ||
// _wait finished waiting | ||
// put 1 (1 -> 0) | ||
// | ||
// However, there are two threads and if the delay between actions | ||
// is not long enough, a race condition where get(1) succeeds before | ||
// get(10) has a chance to add itself to the list would be as | ||
// follows: | ||
// | ||
// get 5 (0 -> 5) | ||
// get_or_fail 10 failed | ||
// get 10 (5 -> 15) | ||
// _wait waiting... | ||
// get 1 (5 -> 6) | ||
// put 5 (5 -> 0) | ||
// _wait finished waiting | ||
// put 10 (10 -> 0) | ||
// put 1 (1 -> 0) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These examples are the same, and both drop from 6 to 5 without warning. Check your example again? :) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I will update the comments, it's confusing indeed. |
||
// | ||
do { | ||
cout << "Trying (2) with delay " << delay << "us\n"; | ||
|
||
ASSERT_FALSE(throttle.get(throttle_max / 2)); | ||
ASSERT_FALSE(throttle.get_or_fail(throttle_max)); | ||
|
||
Thread_get t(throttle, throttle_max); | ||
t.create(); | ||
usleep(delay); | ||
|
||
Thread_get u(throttle, 1); | ||
u.create(); | ||
usleep(delay); | ||
|
||
throttle.put(throttle_max / 2); | ||
|
||
t.join(); | ||
u.join(); | ||
|
||
if(!(waited = t.waited && u.waited)) | ||
delay *= 2; | ||
} while(!waited); | ||
|
||
} | ||
|
||
TEST_F(ThrottleTest, get_or_fail) { | ||
{ | ||
Throttle throttle(g_ceph_context, "throttle"); | ||
|
||
ASSERT_TRUE(throttle.get_or_fail(5)); | ||
ASSERT_TRUE(throttle.get_or_fail(5)); | ||
} | ||
|
||
{ | ||
int64_t throttle_max = 10; | ||
Throttle throttle(g_ceph_context, "throttle", throttle_max); | ||
|
||
ASSERT_TRUE(throttle.get_or_fail(throttle_max)); | ||
ASSERT_EQ(throttle.put(throttle_max), 0); | ||
|
||
ASSERT_TRUE(throttle.get_or_fail(throttle_max * 2)); | ||
ASSERT_FALSE(throttle.get_or_fail(1)); | ||
ASSERT_FALSE(throttle.get_or_fail(throttle_max * 2)); | ||
ASSERT_EQ(throttle.put(throttle_max * 2), 0); | ||
|
||
ASSERT_TRUE(throttle.get_or_fail(throttle_max)); | ||
ASSERT_FALSE(throttle.get_or_fail(1)); | ||
ASSERT_EQ(throttle.put(throttle_max), 0); | ||
} | ||
} | ||
|
||
TEST_F(ThrottleTest, wait) { | ||
int64_t throttle_max = 10; | ||
Throttle throttle(g_ceph_context, "throttle", throttle_max); | ||
|
||
useconds_t delay = 1; | ||
|
||
bool waited; | ||
|
||
do { | ||
cout << "Trying (3) with delay " << delay << "us\n"; | ||
|
||
ASSERT_FALSE(throttle.get(throttle_max / 2)); | ||
ASSERT_FALSE(throttle.get_or_fail(throttle_max)); | ||
|
||
Thread_get t(throttle, throttle_max); | ||
t.create(); | ||
usleep(delay); | ||
|
||
// | ||
// the pending condition will be signaled because | ||
// the "throttle_max - 1" is lower than the current | ||
// maximum. | ||
// | ||
// the condition tries to set a value that is larger than the | ||
// maximum and it succeeds because the current value is lower | ||
// than the maximum | ||
// | ||
throttle.wait(throttle_max - 1); | ||
// | ||
// this would block: | ||
// throttle.wait(throttle_max * 100); | ||
// because the pending condition is only signaled by _reset_max if the | ||
// maximum is lowered. What is the rationale ? | ||
// | ||
usleep(delay); | ||
ASSERT_EQ(throttle.get_current(), throttle_max / 2); | ||
|
||
|
||
t.join(); | ||
|
||
if(!(waited = t.waited)) | ||
delay *= 2; | ||
} while(!waited); | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand what's going on here. If it doesn't block the first time, how could it block on any subsequent run through the loop?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The t->create(); above will create the conditions for the throttle->get_or_fail(1) to block. However, it does so in a separate thread. The loop is waiting for the thread to get to the point where it blocks. It would be nice to get rid of the loop but I could not figure out how to do it without modifying the Throttle.cc code.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, it's getting in line behind the request for 7; I missed the initial get(5). Makes sense!
I think you could do this by with a Mutex, Cond, and flag variable "took_my_portion", where the Throttle_get sets "took_my_portion = true" after doing the throttle.get(), and then signals the Cond and drops the Mutex, right? :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is confusing indeed : get(12) would not block because 12 > 10 ( which is the throttle maximum ) and there is a special case accepting it. It needs to be done in two separate calls to block.
I'm not sure I understand what you suggest. The loop is waiting for throttle->get_or_fail(1) to block which will only happen while the throttle.get() is waiting in the other thread. Would you be so kind as to explain your idea in more details ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My idea was how to get rid of the loop, since you were mentioning that would be nice — with the standard Cond, Mutex, bool pattern. We use it a lot with eg SafeCond; you could look at people who use that in the Ceph code.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And to be clear, that's not a blocker for me. I just missed one of the get()s and the race condition which this loop exists for. :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did not know about C_SafeCond, nice :-) I took a look at how *ObjectCacher::flush_set(ObjectSet oset, Context onfinish) uses it when called from Client::_flush_range(Inode *in, int64_t offset, uint64_t size). A similar approach would be to Signal a C_SafeCond when the Throttle list<Cond> cond is not empty ( meaning all calls to Throttle::get_or_fail would return false ), just after cond.push_back(cv); in Throttle::_wait. To achieve that the C_SafeCond object would have to be given in argument to Throttle::_wait and Throttle::get(int64_t c, int64_t m). I don't see a use for such an API change, except for testing purposes but if you think it's worth it, I'd be happy to amend the patch accordingly.
When trying to figure a way to wait for the required condition to happen in a given thread, I was most concerned about the delay it introduces. It is annoying when unit tests are slow. By starting with a delay of one microsecond and doubling it when it's not enough, I've experienced that even on a laptop it rarely needs to pause more than two microseconds.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I meant you could use it externally to signal "I've taken my throttle allotment", which wouldn't require API changes.
However, this isn't something I'd worry about and the current style doesn't bother me. You want to just fix the example comments below, rebase on top of the condition check fix, and re-submit for pull? :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now I understand. That would work indeed and I will still need to loop when expecting "I'm paused because I wait to be signaled", right ?
I will rebase the patch and resubmit. Thanks.