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 2011/06/05 10:49:50 UTC
svn commit: r1132139 - in /incubator/mesos/trunk/src: master/main.cpp
master/master.cpp tests/Makefile.in tests/test_event_history.cpp
Author: benh
Date: Sun Jun 5 08:49:49 2011
New Revision: 1132139
URL: http://svn.apache.org/viewvc?rev=1132139&view=rev
Log:
Cleaned up a couple of couts that should have been LOG(INFO).
Added a few unit tests.
Added:
incubator/mesos/trunk/src/tests/test_event_history.cpp
Modified:
incubator/mesos/trunk/src/master/main.cpp
incubator/mesos/trunk/src/master/master.cpp
incubator/mesos/trunk/src/tests/Makefile.in
Modified: incubator/mesos/trunk/src/master/main.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/main.cpp?rev=1132139&r1=1132138&r2=1132139&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master/main.cpp (original)
+++ incubator/mesos/trunk/src/master/main.cpp Sun Jun 5 08:49:49 2011
@@ -57,9 +57,9 @@ int main(int argc, char **argv)
Logging::init(argv[0], params);
- cout << "Creating event logger." << endl;
+ LOG(INFO) << "Creating event logger." << endl;
EventLogger evLogger(params);
- cout << "Done creating event logger." << endl;
+ LOG(INFO) << "Done creating event logger." << endl;
if (params.contains("port"))
setenv("LIBPROCESS_PORT", params["port"].c_str(), 1);
Modified: incubator/mesos/trunk/src/master/master.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/master.cpp?rev=1132139&r1=1132138&r2=1132139&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master/master.cpp (original)
+++ incubator/mesos/trunk/src/master/master.cpp Sun Jun 5 08:49:49 2011
@@ -324,9 +324,8 @@ void Master::operator () ()
}
- cout << "About to register framework with event history" << endl;
evLogger->logFrameworkRegistered(fid, framework->user);
- cout << "Registered framework with event history" << endl;
+ LOG(INFO) << "Logged framework registered to event history" << endl;
addFramework(framework);
break;
}
Modified: incubator/mesos/trunk/src/tests/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/Makefile.in?rev=1132139&r1=1132138&r2=1132139&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/Makefile.in (original)
+++ incubator/mesos/trunk/src/tests/Makefile.in Sun Jun 5 08:49:49 2011
@@ -87,7 +87,7 @@ EXEC_LIB = $(LIBDIR)/libmesos_exec.a
TESTS_OBJ = main.o test_master.o test_resources.o external_test.o \
test_sample_frameworks.o testing_utils.o \
test_configurator.o test_string_utils.o \
- test_lxc_isolation.o
+ test_lxc_isolation.o test_event_history.o
ALLTESTS_EXE = $(BINDIR)/tests/alltests
Added: incubator/mesos/trunk/src/tests/test_event_history.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/test_event_history.cpp?rev=1132139&view=auto
==============================================================================
--- incubator/mesos/trunk/src/tests/test_event_history.cpp (added)
+++ incubator/mesos/trunk/src/tests/test_event_history.cpp Sun Jun 5 08:49:49 2011
@@ -0,0 +1,93 @@
+#include <cstdio>
+#include <gtest/gtest.h>
+#include <sys/stat.h>
+
+#include "common/params.hpp"
+
+#include "event_history/event_history.hpp"
+
+#include "master/master.hpp"
+
+#include "testing_utils.hpp"
+
+using namespace mesos::internal::eventhistory;
+using namespace mesos::internal::test;
+using mesos::FrameworkID;
+using mesos::internal::Params;
+
+/* TODO(*):
+ 1) EventLogger API test
+ - create an EventLogger, register a TestEventWriter, test all
+ logging statements.
+ 2) Master and Slave's use of Event history
+ - create a Master and Slave, simulate sending them messages (e.g.
+ adding a slave to a master) and see if the right output is logged.
+ 3) EventWriter tests
+ */
+
+TEST_WITH_WORKDIR(EventHistoryTest, EventLoggingTurnedOff)
+{
+ EXPECT_TRUE(GTEST_IS_THREADSAFE);
+
+ Params params;
+ params.set<bool>("event-history-sqlite", false);
+ params.set<bool>("event-history-file", false);
+ EventLogger evLogger(params);
+ FrameworkID fid = "MasterID-FrameworkID";
+ evLogger.logFrameworkRegistered(fid, "UserID");
+
+ struct stat sb;
+ // make sure eventlog file and sqlite db were NOT created
+ EXPECT_EQ(stat("logs/event_history_log.txt", &sb), -1);
+ EXPECT_FALSE(S_ISREG(sb.st_mode));
+
+ EXPECT_EQ(stat("logs/event_history_db.sqlite3", &sb), -1);
+ EXPECT_FALSE(S_ISREG(sb.st_mode));
+}
+
+//This test might be unecessary
+TEST_WITH_WORKDIR(EventHistoryTest, NoEventLoggingIfLogDirNotSet)
+{
+ EXPECT_TRUE(GTEST_IS_THREADSAFE);
+
+ struct stat sb;
+ //the following two lines might be unecesary
+ remove("logs/event_history_log.txt");
+ EXPECT_EQ(stat("logs", &sb), -1);
+
+ Params params;
+ params.set<bool>("event-history-sqlite", true);
+ params.set<bool>("event-history-file", true);
+ params.set<string>("log_dir", "");
+ EventLogger evLogger(params);
+ FrameworkID fid = "MasterID-FrameworkID";
+ evLogger.logFrameworkRegistered(fid, "UserID");
+
+ // make sure eventlog file and sqlite db were NOT created
+ EXPECT_EQ(stat("logs/event_history_log.txt", &sb), -1);
+ EXPECT_FALSE(S_ISREG(sb.st_mode));
+
+ EXPECT_EQ(stat("logs/event_history_db.sqlite3", &sb), -1);
+ EXPECT_FALSE(S_ISREG(sb.st_mode));
+}
+
+TEST_WITH_WORKDIR(EventHistoryTest, UsesLogDirLocation)
+{
+ EXPECT_TRUE(GTEST_IS_THREADSAFE);
+
+ Params params;
+ params.set<bool>("event-history-sqlite", true);
+ params.set<bool>("event-history-file", true);
+ params.set<string>("log_dir", "test-log-dir");
+ EventLogger evLogger(params);
+ FrameworkID fid = "MasterID-FrameworkID";
+ evLogger.logFrameworkRegistered(fid, "UserID");
+
+ struct stat sb;
+ // make sure eventlog file and sqlite db were created in the correct location
+ EXPECT_NE(stat("test-log-dir/event_history_log.txt", &sb), -1);
+ EXPECT_TRUE(S_ISREG(sb.st_mode));
+
+ EXPECT_NE(stat("test-log-dir/event_history_db.sqlite3", &sb), -1);
+ EXPECT_TRUE(S_ISREG(sb.st_mode));
+}