svn commit: r1131913 - in /incubator/mesos/trunk/src: leader_detector.cpp master.cpp mesos_sched.cpp

[be...@apache.org]

Author: benh
Date: Sun Jun  5 05:50:22 2011
New Revision: 1131913

URL: http://svn.apache.org/viewvc?rev=1131913&view=rev
Log:
Replaced DLOG messages with either VLOG(1) or LOG (the former if they
were spammy, the latter for some messages that looked important enough
to show even in non-debug builds). Fixes #77.

Modified:
    incubator/mesos/trunk/src/leader_detector.cpp
    incubator/mesos/trunk/src/master.cpp
    incubator/mesos/trunk/src/mesos_sched.cpp

Modified: incubator/mesos/trunk/src/leader_detector.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/leader_detector.cpp?rev=1131913&r1=1131912&r2=1131913&view=diff
==============================================================================
--- incubator/mesos/trunk/src/leader_detector.cpp (original)
+++ incubator/mesos/trunk/src/leader_detector.cpp Sun Jun  5 05:50:22 2011
@@ -68,17 +68,17 @@ LeaderDetector::LeaderDetector(const str
 
 void LeaderDetector::leaderWatch(zhandle_t *zh, int type, int state, const char *path) {
   if (type == ZOO_CREATED_EVENT) {
-    DLOG(INFO) << "Leader Watch Event type: ZOO_CREATED_EVENT";
+    LOG(INFO) << "Leader Watch Event type: ZOO_CREATED_EVENT";
   } else if (type == ZOO_DELETED_EVENT) {
-    DLOG(INFO) << "Leader Watch Event type: ZOO_DELETED_EVENT";
+    LOG(INFO) << "Leader Watch Event type: ZOO_DELETED_EVENT";
   } else if (type == ZOO_CHANGED_EVENT) {
-    DLOG(INFO) << "Leader Watch Event type: ZOO_CHANGED_EVENT";
+    LOG(INFO) << "Leader Watch Event type: ZOO_CHANGED_EVENT";
   } else if (type == ZOO_CHILD_EVENT) {
-    DLOG(INFO) << "Leader Watch Event type: ZOO_CHILD_EVENT";
+    LOG(INFO) << "Leader Watch Event type: ZOO_CHILD_EVENT";
   } else if (type == ZOO_SESSION_EVENT) {
-    DLOG(INFO) << "Leader Watch Event type: ZOO_SESSION_EVENT";
+    LOG(INFO) << "Leader Watch Event type: ZOO_SESSION_EVENT";
   } else if (type == ZOO_NOTWATCHING_EVENT) {
-    DLOG(INFO) << "Leader Watch Event type: ZOO_NOTWATCHING_EVENT";
+    LOG(INFO) << "Leader Watch Event type: ZOO_NOTWATCHING_EVENT";
   }
   detectLeader();
 }

Modified: incubator/mesos/trunk/src/master.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master.cpp?rev=1131913&r1=1131912&r2=1131913&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master.cpp (original)
+++ incubator/mesos/trunk/src/master.cpp Sun Jun  5 05:50:22 2011
@@ -481,7 +481,7 @@ void Master::operator () ()
       string data;
 
       unpack<S2M_FT_STATUS_UPDATE>(sid, fid, tid, state, data);
-      DLOG(INFO) << "FT: prepare relay seq:"<< seq() << " from: "<< from();
+      VLOG(1) << "FT: prepare relay seq:"<< seq() << " from: "<< from();
       if (Slave *slave = lookupSlave(sid)) {
         if (Framework *framework = lookupFramework(fid)) {
           // Pass on the status update to the framework.
@@ -631,7 +631,7 @@ void Master::operator () ()
 
       // int cnts = 0;
       // foreachpair(_, Framework *framework, frameworks) {
-      // 	DLOG(INFO) << (cnts++) << " resourceInUse:" << framework->resources;
+      // 	VLOG(1) << (cnts++) << " resourceInUse:" << framework->resources;
       // }
       break;
     }

Modified: incubator/mesos/trunk/src/mesos_sched.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/mesos_sched.cpp?rev=1131913&r1=1131912&r2=1131913&view=diff
==============================================================================
--- incubator/mesos/trunk/src/mesos_sched.cpp (original)
+++ incubator/mesos/trunk/src/mesos_sched.cpp Sun Jun  5 05:50:22 2011
@@ -71,14 +71,14 @@ protected:
 
       case PROCESS_TIMEOUT: {
         terminate = true;
-        DLOG(INFO) << "FT: faking M2F_STATUS_UPDATE due to ReplyToOffer timeout for tid:" << tid;
+        VLOG(1) << "FT: faking M2F_STATUS_UPDATE due to ReplyToOffer timeout for tid:" << tid;
         send(parent, pack<M2F_STATUS_UPDATE>(tid, TASK_LOST, ""));
         break;
       }
 
       }
     }
-    DLOG(INFO) << "FT: Exiting reliable reply for tid:" << tid;
+    VLOG(1) << "FT: Exiting reliable reply for tid:" << tid;
   }
 
 private:
@@ -280,7 +280,7 @@ protected:
         if (duplicate())
           break;
         ack();
-        DLOG(INFO) << "FT: Received message with id: " << seq();
+        VLOG(1) << "FT: Received message with id: " << seq();
 
 	unordered_map <TaskID, RbReply *>::iterator it = rbReplies.find(tid);
 	if (it != rbReplies.end()) {