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 2012/05/14 20:01:47 UTC
svn commit: r1338315 - in /incubator/mesos/trunk/src: log/replica.cpp
messages/log.hpp messages/messages.proto zookeeper/group.cpp
Author: benh
Date: Mon May 14 18:01:46 2012
New Revision: 1338315
URL: http://svn.apache.org/viewvc?rev=1338315&view=rev
Log:
Minor code cleanup (https://reviews.apache.org/r/4979).
Modified:
incubator/mesos/trunk/src/log/replica.cpp
incubator/mesos/trunk/src/messages/log.hpp
incubator/mesos/trunk/src/messages/messages.proto
incubator/mesos/trunk/src/zookeeper/group.cpp
Modified: incubator/mesos/trunk/src/log/replica.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/log/replica.cpp?rev=1338315&r1=1338314&r2=1338315&view=diff
==============================================================================
--- incubator/mesos/trunk/src/log/replica.cpp (original)
+++ incubator/mesos/trunk/src/log/replica.cpp Mon May 14 18:01:46 2012
@@ -40,7 +40,6 @@ using std::list;
using std::set;
using std::string;
-
namespace mesos {
namespace internal {
namespace log {
@@ -443,10 +442,10 @@ Try<Action> LevelDBStorage::read(uint64_
Timer timer;
timer.start();
- string value;
-
leveldb::ReadOptions options;
+ string value;
+
leveldb::Status status = db->Get(options, encode(position), &value);
if (!status.ok()) {
Modified: incubator/mesos/trunk/src/messages/log.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/messages/log.hpp?rev=1338315&r1=1338314&r2=1338315&view=diff
==============================================================================
--- incubator/mesos/trunk/src/messages/log.hpp (original)
+++ incubator/mesos/trunk/src/messages/log.hpp Mon May 14 18:01:46 2012
@@ -22,5 +22,3 @@
#include "messages/log.pb.h"
#endif // __MESSAGES_LOG_HPP__
-
-
Modified: incubator/mesos/trunk/src/messages/messages.proto
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/messages/messages.proto?rev=1338315&r1=1338314&r2=1338315&view=diff
==============================================================================
--- incubator/mesos/trunk/src/messages/messages.proto (original)
+++ incubator/mesos/trunk/src/messages/messages.proto Mon May 14 18:01:46 2012
@@ -55,6 +55,12 @@ message StatusUpdate {
}
+message Slaves
+{
+ repeated SlaveInfo infos = 1;
+}
+
+
message SubmitSchedulerRequest
{
required string name = 1;
Modified: incubator/mesos/trunk/src/zookeeper/group.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/zookeeper/group.cpp?rev=1338315&r1=1338314&r2=1338315&view=diff
==============================================================================
--- incubator/mesos/trunk/src/zookeeper/group.cpp (original)
+++ incubator/mesos/trunk/src/zookeeper/group.cpp Mon May 14 18:01:46 2012
@@ -45,7 +45,7 @@ public:
const Option<Authentication>& auth = Option<Authentication>());
~GroupProcess();
- void initialize();
+ virtual void initialize();
// Group implementation.
Future<Group::Membership> join(const string& data);
@@ -825,7 +825,6 @@ Group::Group(const string& servers,
{
process = new GroupProcess(servers, timeout, znode, auth);
spawn(process);
- dispatch(process, &GroupProcess::initialize);
}