You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2015/06/14 11:46:36 UTC
[18/21] mesos git commit: mesos: Use CHECK_SOME, CHECK_NONE,
CHECK_ERROR.
mesos: Use CHECK_SOME, CHECK_NONE, CHECK_ERROR.
Used `grep -r "CHECK([^\!].*\.isNone())" .` to find the instances that
look like `CHECK(x.isNone());`
Review: https://reviews.apache.org/r/35426
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/26527296
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/26527296
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/26527296
Branch: refs/heads/master
Commit: 26527296f1e4ffc53a4545a63e1e6e0cee06e9f9
Parents: 9823648
Author: Michael Park <mc...@gmail.com>
Authored: Sat Jun 13 07:29:31 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sun Jun 14 02:43:01 2015 -0700
----------------------------------------------------------------------
src/launcher/fetcher.cpp | 2 +-
src/linux/cgroups.cpp | 2 +-
src/master/registrar.cpp | 2 +-
src/slave/containerizer/isolators/cgroups/cpushare.cpp | 2 +-
src/slave/containerizer/isolators/cgroups/mem.cpp | 2 +-
src/slave/status_update_manager.cpp | 8 ++++----
src/state/leveldb.cpp | 4 ++--
src/state/zookeeper.cpp | 6 +++---
src/zookeeper/contender.cpp | 2 +-
src/zookeeper/group.cpp | 10 +++++-----
10 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/26527296/src/launcher/fetcher.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp
index a3d27dc..8aee490 100644
--- a/src/launcher/fetcher.cpp
+++ b/src/launcher/fetcher.cpp
@@ -385,7 +385,7 @@ int main(int argc, char* argv[])
logging::initialize(argv[0], flags, true); // Catch signals.
const Option<std::string> jsonFetcherInfo = os::getenv("MESOS_FETCHER_INFO");
- CHECK(jsonFetcherInfo.isSome())
+ CHECK_SOME(jsonFetcherInfo)
<< "Missing MESOS_FETCHER_INFO environment variable";
LOG(INFO) << "Fetcher Info: " << jsonFetcherInfo.get();
http://git-wip-us.apache.org/repos/asf/mesos/blob/26527296/src/linux/cgroups.cpp
----------------------------------------------------------------------
diff --git a/src/linux/cgroups.cpp b/src/linux/cgroups.cpp
index a612fab..6a87ac4 100644
--- a/src/linux/cgroups.cpp
+++ b/src/linux/cgroups.cpp
@@ -2320,7 +2320,7 @@ private:
void _listen(const process::Future<uint64_t>& future)
{
- CHECK(error.isNone());
+ CHECK_NONE(error);
if (future.isReady()) {
value_ += future.get();
http://git-wip-us.apache.org/repos/asf/mesos/blob/26527296/src/master/registrar.cpp
----------------------------------------------------------------------
diff --git a/src/master/registrar.cpp b/src/master/registrar.cpp
index 3fde8fa..b871229 100644
--- a/src/master/registrar.cpp
+++ b/src/master/registrar.cpp
@@ -419,7 +419,7 @@ void RegistrarProcess::update()
}
CHECK(!updating);
- CHECK(error.isNone());
+ CHECK_NONE(error);
CHECK_SOME(variable);
// Time how long it takes to apply the operations.
http://git-wip-us.apache.org/repos/asf/mesos/blob/26527296/src/slave/containerizer/isolators/cgroups/cpushare.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/cpushare.cpp b/src/slave/containerizer/isolators/cgroups/cpushare.cpp
index 5bd3525..21e4284 100644
--- a/src/slave/containerizer/isolators/cgroups/cpushare.cpp
+++ b/src/slave/containerizer/isolators/cgroups/cpushare.cpp
@@ -315,7 +315,7 @@ Future<Nothing> CgroupsCpushareIsolatorProcess::isolate(
Info* info = CHECK_NOTNULL(infos[containerId]);
- CHECK(info->pid.isNone());
+ CHECK_NONE(info->pid);
info->pid = pid;
foreach (const string& subsystem, subsystems) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/26527296/src/slave/containerizer/isolators/cgroups/mem.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/mem.cpp b/src/slave/containerizer/isolators/cgroups/mem.cpp
index 7fb6c8a..9d65bf5 100644
--- a/src/slave/containerizer/isolators/cgroups/mem.cpp
+++ b/src/slave/containerizer/isolators/cgroups/mem.cpp
@@ -299,7 +299,7 @@ Future<Nothing> CgroupsMemIsolatorProcess::isolate(
Info* info = CHECK_NOTNULL(infos[containerId]);
- CHECK(info->pid.isNone());
+ CHECK_NONE(info->pid);
info->pid = pid;
Try<Nothing> assign = cgroups::assign(hierarchy, info->cgroup, pid);
http://git-wip-us.apache.org/repos/asf/mesos/blob/26527296/src/slave/status_update_manager.cpp
----------------------------------------------------------------------
diff --git a/src/slave/status_update_manager.cpp b/src/slave/status_update_manager.cpp
index 1d7c4d0..35b943b 100644
--- a/src/slave/status_update_manager.cpp
+++ b/src/slave/status_update_manager.cpp
@@ -352,7 +352,7 @@ Future<Nothing> StatusUpdateManagerProcess::_update(
// Forward the status update to the master if this is the first in the stream.
// Subsequent status updates will get sent in 'acknowledgement()'.
if (!paused && stream->pending.size() == 1) {
- CHECK(stream->timeout.isNone());
+ CHECK_NONE(stream->timeout);
const Result<StatusUpdate>& next = stream->next();
if (next.isError()) {
return Failure(next.error());
@@ -470,7 +470,7 @@ void StatusUpdateManagerProcess::timeout(const Duration& duration)
foreachvalue (StatusUpdateStream* stream, streams[frameworkId]) {
CHECK_NOTNULL(stream);
if (!stream->pending.empty()) {
- CHECK(stream->timeout.isSome());
+ CHECK_SOME(stream->timeout);
if (stream->timeout.get().expired()) {
const StatusUpdate& update = stream->pending.front();
LOG(WARNING) << "Resending status update " << update;
@@ -814,7 +814,7 @@ Try<Nothing> StatusUpdateStream::handle(
const StatusUpdate& update,
const StatusUpdateRecord::Type& type)
{
- CHECK(error.isNone());
+ CHECK_NONE(error);
// Checkpoint the update if necessary.
if (checkpoint) {
@@ -850,7 +850,7 @@ void StatusUpdateStream::_handle(
const StatusUpdate& update,
const StatusUpdateRecord::Type& type)
{
- CHECK(error.isNone());
+ CHECK_NONE(error);
if (type == StatusUpdateRecord::UPDATE) {
// Record this update.
http://git-wip-us.apache.org/repos/asf/mesos/blob/26527296/src/state/leveldb.cpp
----------------------------------------------------------------------
diff --git a/src/state/leveldb.cpp b/src/state/leveldb.cpp
index 4303df3..14a1807 100644
--- a/src/state/leveldb.cpp
+++ b/src/state/leveldb.cpp
@@ -206,7 +206,7 @@ Future<bool> LevelDBStorageProcess::expunge(const Entry& entry)
Try<Option<Entry> > LevelDBStorageProcess::read(const string& name)
{
- CHECK(error.isNone());
+ CHECK_NONE(error);
leveldb::ReadOptions options;
@@ -234,7 +234,7 @@ Try<Option<Entry> > LevelDBStorageProcess::read(const string& name)
Try<bool> LevelDBStorageProcess::write(const Entry& entry)
{
- CHECK(error.isNone());
+ CHECK_NONE(error);
leveldb::WriteOptions options;
options.sync = true;
http://git-wip-us.apache.org/repos/asf/mesos/blob/26527296/src/state/zookeeper.cpp
----------------------------------------------------------------------
diff --git a/src/state/zookeeper.cpp b/src/state/zookeeper.cpp
index d355bd7..9151d55 100644
--- a/src/state/zookeeper.cpp
+++ b/src/state/zookeeper.cpp
@@ -426,7 +426,7 @@ Result<std::set<string> > ZooKeeperStorageProcess::doNames()
Result<Option<Entry> > ZooKeeperStorageProcess::doGet(const string& name)
{
- CHECK(error.isNone()) << ": " << error.get();
+ CHECK_NONE(error) << ": " << error.get();
CHECK(state == CONNECTED);
string result;
@@ -460,7 +460,7 @@ Result<Option<Entry> > ZooKeeperStorageProcess::doGet(const string& name)
Result<bool> ZooKeeperStorageProcess::doSet(const Entry& entry,
const UUID& uuid)
{
- CHECK(error.isNone()) << ": " << error.get();
+ CHECK_NONE(error) << ": " << error.get();
CHECK(state == CONNECTED);
// Serialize to make sure we're under the 1 MB limit.
@@ -558,7 +558,7 @@ Result<bool> ZooKeeperStorageProcess::doSet(const Entry& entry,
Result<bool> ZooKeeperStorageProcess::doExpunge(const Entry& entry)
{
- CHECK(error.isNone()) << ": " << error.get();
+ CHECK_NONE(error) << ": " << error.get();
CHECK(state == CONNECTED);
string result;
http://git-wip-us.apache.org/repos/asf/mesos/blob/26527296/src/zookeeper/contender.cpp
----------------------------------------------------------------------
diff --git a/src/zookeeper/contender.cpp b/src/zookeeper/contender.cpp
index 55cb7a1..3255ef0 100644
--- a/src/zookeeper/contender.cpp
+++ b/src/zookeeper/contender.cpp
@@ -226,7 +226,7 @@ void LeaderContenderProcess::joined()
CHECK(!candidacy.isDiscarded());
// Cannot be watching because the candidacy is not obtained yet.
- CHECK(watching.isNone());
+ CHECK_NONE(watching);
CHECK_SOME(contending);
http://git-wip-us.apache.org/repos/asf/mesos/blob/26527296/src/zookeeper/group.cpp
----------------------------------------------------------------------
diff --git a/src/zookeeper/group.cpp b/src/zookeeper/group.cpp
index 173caa8..33c56da 100644
--- a/src/zookeeper/group.cpp
+++ b/src/zookeeper/group.cpp
@@ -267,7 +267,7 @@ Future<set<Group::Membership> > GroupProcess::watch(
// Non-retryable error.
return Failure(cached.error());
} else if (!cached.get()) {
- CHECK(memberships.isNone());
+ CHECK_NONE(memberships);
// Try again later.
if (!retrying) {
@@ -430,7 +430,7 @@ void GroupProcess::reconnecting(int64_t sessionId)
// we create a local timer and "expire" our session prematurely if
// we haven't reconnected within the session expiration time out.
// The timer can be reset if the connection is restored.
- CHECK(timer.isNone());
+ CHECK_NONE(timer);
// Use the negotiated session timeout for the reconnect timer.
timer = delay(zk->getSessionTimeout(),
@@ -533,7 +533,7 @@ void GroupProcess::updated(int64_t sessionId, const string& path)
if (cached.isError()) {
abort(cached.error()); // Cancel everything pending.
} else if (!cached.get()) {
- CHECK(memberships.isNone());
+ CHECK_NONE(memberships);
// Try again later.
if (!retrying) {
@@ -868,7 +868,7 @@ Try<bool> GroupProcess::sync()
if (memberships.isNone()) {
Try<bool> cached = cache();
if (cached.isError() || !cached.get()) {
- CHECK(memberships.isNone());
+ CHECK_NONE(memberships);
return cached;
} else {
update(); // Update any pending watches.
@@ -889,7 +889,7 @@ void GroupProcess::retry(const Duration& duration)
// We cancel the retries when the group aborts and when its ZK
// session expires so 'retrying' should be false in the condition
// check above.
- CHECK(error.isNone());
+ CHECK_NONE(error);
// In order to be retrying, we should be at least CONNECTED.
CHECK(state == CONNECTED || state == AUTHENTICATED || state == READY)