porto: refactor deamons and logging

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>

debian/yandex-porto.logrotate

@@ -11,16 +11,3 @@
 	endscript
 
 }
-
-/var/log/portoloop.log {
-	size 400M
-	missingok
-	rotate 7
-	compress
-	notifempty
-	nocreate
-
-	postrotate
-		[ -f /run/portoloop.pid ] && kill -USR1 `cat /run/portoloop.pid`
-	endscript
-}

scripts/standalone_test

@@ -65,7 +65,7 @@ test $(id -u) = "0" || die "current user not root"
 trap stop_porto TERM INT QUIT EXIT
 kill_porto
 
-rm -f /var/log/portod.log /var/log/portoloop.log
+rm -f /var/log/portod.log
 
 start_porto
 

src/cgroup.cpp

@@ -1276,7 +1276,7 @@ TError InitializeDaemonCgroups() {
                 return error;
         }
 
-        // portod-slave
+        // portod
         error = cg.Attach(GetPid());
         if (error)
             return error;

src/common.hpp

@@ -75,13 +75,12 @@ constexpr const char *PORTO_VERSION_FILE = "/run/portod.version";
 constexpr const char *PORTO_BINARY_PATH = "/run/portod";
 
 constexpr const char *PORTO_MASTER_PIDFILE = "/run/portoloop.pid";
-constexpr const char *PORTO_SLAVE_PIDFILE = "/run/portod.pid";
+constexpr const char *PORTO_PIDFILE = "/run/portod.pid";
 
-constexpr const char *PORTOD_MASTER_NAME = "portod";
-constexpr const char *PORTOD_SLAVE_NAME = "portod-slave";
+constexpr const char *PORTOD_MASTER_NAME = "portod-master";
+constexpr const char *PORTOD_NAME = "portod";
 
-constexpr const char *PORTO_MASTER_LOG = "/var/log/portoloop.log";
-constexpr const char *PORTO_SLAVE_LOG = "/var/log/portod.log";
+constexpr const char *PORTO_LOG = "/var/log/portod.log";
 
 constexpr const char *PORTO_CONTAINERS_KV = "/run/porto/kvs";
 constexpr const char *PORTO_VOLUMES_KV = "/run/porto/pkvs";

src/config.cpp

@@ -1,5 +1,3 @@
-#include <iostream>
-
 #include "config.hpp"
 #include "protobuf.hpp"
 #include "util/unix.hpp"
@@ -133,21 +131,6 @@ bool TConfig::LoadFile(const std::string &path) {
     return true;
 }
 
-static void InitIpcSysctl() {
-    for (const auto &key: IpcSysctls) {
-        bool set = false;
-        for (const auto &it: config().container().ipc_sysctl())
-            set |= it.key() == key;
-        std::string val;
-        /* load default ipc sysctl from host config */
-        if (!set && !GetSysctl(key, val)) {
-            auto sysctl = config().mutable_container()->add_ipc_sysctl();
-            sysctl->set_key(key);
-            sysctl->set_val(val);
-        }
-    }
-}
-
 void TConfig::Load() {
     LoadDefaults();
 
@@ -156,32 +139,6 @@ void TConfig::Load() {
 
     Debug |= config().log().debug();
     Verbose |= Debug | config().log().verbose();
-
-    InitCred();
-    InitCapabilities();
-    InitIpcSysctl();
-}
-
-int TConfig::Test(const std::string &path) {
-    TFile file;
-
-    if (access(path.c_str(), F_OK)) {
-        std::cerr << "Config " << path << " doesn't exist" << std::endl;
-        return EXIT_FAILURE;
-    }
-
-    if (file.OpenRead(path)) {
-        std::cerr << "Can't open " << path << std::endl;
-        return EXIT_FAILURE;
-    }
-
-    google::protobuf::io::FileInputStream pist(file.Fd);
-
-    cfg::TCfg cfg;
-    if (!google::protobuf::TextFormat::Merge(&pist, &cfg))
-        return EXIT_FAILURE;
-
-    return EXIT_SUCCESS;
 }
 
 cfg::TCfg &TConfig::operator()() {

src/config.hpp

@@ -17,7 +17,6 @@ class TConfig : public TNonCopyable {
 public:
     TConfig() {}
     void Load();
-    int Test(const std::string &path);
     cfg::TCfg &operator()();
 };
 

src/event.cpp

@@ -28,10 +28,8 @@ class TEventWorker : public TWorker<TEvent, std::priority_queue<TEvent>> {
             if (Top().DueMs <= now)
                 return;
             auto timeout = Top().DueMs - now;
-            Statistics->SlaveTimeoutMs = timeout;
             Cv.wait_for(lock, std::chrono::milliseconds(timeout));
         } else {
-            Statistics->SlaveTimeoutMs = 0;
             TWorker::Wait(lock);
         }
     }