Commit a9169f60 authored by Marc Vef's avatar Marc Vef
Browse files

Reduced verbosity of startup and shutdown logging

parent f54c7cd9

ifs/configure_public.hpp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
// Enable logging for preload

#define LOG_PRELOAD_INFO

//#define LOG_PRELOAD_DEBUG

#define LOG_PRELOAD_TRACE

//#define LOG_PRELOAD_TRACE

#define LOG_PRELOAD_PATH "/tmp/adafs_preload.log"



// Set a hostname suffix when a connection is built. E.g., "-ib" to use Infiniband

ifs/scripts/startup_adafs.py

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
# -*- coding: utf-8 -*-



import argparse

import time



import os

import time



from util import util
@@ -118,7 +118,7 @@ def init_system(daemon_path, rootdir, mountdir, nodelist, cleanroot): 
            time.sleep(1)



    # Check adafs logs for errors

    cmd_chk_str = '%s "head -6 /tmp/adafs_daemon.log"' % pssh

    cmd_chk_str = '%s "head -5 /tmp/adafs_daemon.log"' % pssh

    if PRETEND:

        print 'Pretending: %s' % cmd_chk_str

    else:

ifs/src/daemon/adafs_daemon.cpp

+3 −4
Original line number Diff line number Diff line
@@ -54,11 +54,10 @@ void destroy_enviroment() { 
    cout << "\n####################\n\nMargo RPC server stats: " << endl;

    margo_diag_dump(RPC_DATA->server_rpc_mid(), "-", 0);

#endif

    ADAFS_DATA->spdlogger()->info("{}() Shutting down daemon ...", __func__);

    if (!deregister_daemon_proc())

        ADAFS_DATA->spdlogger()->warn("{}() Unable to clean up auxiliary files", __func__);

    else

        ADAFS_DATA->spdlogger()->info("{}() Cleaning auxiliary files successful", __func__);

        ADAFS_DATA->spdlogger()->debug("{}() Cleaning auxiliary files successful", __func__);

    // The shutdown order is important because the RPC server is started first, it has to be stopped last due to Argobots

    if (RPC_DATA->server_ipc_mid() != nullptr) {

        margo_finalize(RPC_DATA->server_ipc_mid());
@@ -78,7 +77,7 @@ bool init_ipc_server() { 
    char addr_self_cstring[128];





    ADAFS_DATA->spdlogger()->info("{}() Initializing Margo IPC server...", __func__);

    ADAFS_DATA->spdlogger()->debug("{}() Initializing Margo IPC server...", __func__);

    // Start Margo (this will also initialize Argobots and Mercury internally)

    auto mid = margo_init(protocol_port.c_str(), MARGO_SERVER_MODE, 1, 16);
@@ -123,7 +122,7 @@ bool init_rpc_server() { 
    hg_addr_t addr_self;

    hg_size_t addr_self_cstring_sz = 128;

    char addr_self_cstring[128];

    ADAFS_DATA->spdlogger()->info("{}() Initializing Margo RPC server...", __func__);

    ADAFS_DATA->spdlogger()->debug("{}() Initializing Margo RPC server...", __func__);

    // Start Margo (this will also initialize Argobots and Mercury internally)

    auto mid = margo_init(protocol_port.c_str(), MARGO_SERVER_MODE, 1, 16);

    if (mid == MARGO_INSTANCE_NULL) {

ifs/src/db/db_util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ bool init_rocksdb() { 
//    rocksdb::OptimisticTransactionDB* txn_db;

//    rocksdb::OptimisticTransactionOptions txn_options{};

//    ADAFS_DATA->txn_rdb_options(txn_options);

    ADAFS_DATA->spdlogger()->info("{}() RocksDB options set. About to connect...", __func__);

    ADAFS_DATA->spdlogger()->debug("{}() RocksDB options set. About to connect...", __func__);

    // open DB

//    auto s = rocksdb::OptimisticTransactionDB::Open(ADAFS_DATA->rdb_options(), ADAFS_DATA->rdb_path(), &txn_db);

    auto s = rocksdb::DB::Open(ADAFS_DATA->rdb_options(), ADAFS_DATA->rdb_path(), &db);

ifs/src/preload/passthrough.cpp

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ void init_passthrough_() { 
    spdlog::set_level(spdlog::level::off);

#endif



    ld_logger->info("{}() Passthrough initialized.", __func__);

    ld_logger->debug("{}() Passthrough initialized.", __func__);

}



void init_passthrough_if_needed() {