From: Colin Patrick McCabe Date: Wed, 16 Feb 2011 17:21:23 +0000 (-0800) Subject: dout: don't print version when forcing fg logging. X-Git-Tag: v0.25~108 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=651fac6d8b204c0977cc8980f303e7a130347856;p=ceph.git dout: don't print version when forcing fg logging. dout: don't print version when forcing fg logging. Fix tests that were assuming us to spew errors about /var/log, which we no longer do. Signed-off-by: Colin McCabe --- diff --git a/src/common/debug.cc b/src/common/debug.cc index 84471872a0cb..0f433a7ea399 100644 --- a/src/common/debug.cc +++ b/src/common/debug.cc @@ -7,6 +7,7 @@ #include #include #include +#include // debug output std::ostream *_dout = NULL; @@ -21,7 +22,20 @@ pthread_mutex_t _dout_lock = PTHREAD_MUTEX_INITIALIZER; #define _STR(x) #x #define STRINGIFY(x) _STR(x) -void _dout_open_log(bool print_version) +std::string ceph_version_to_string(void) +{ + std::ostringstream oss; + oss << "ceph version " << VERSION << " (commit:" + << STRINGIFY(CEPH_GIT_VER) << ")"; + return oss.str(); +} + +void dout_output_ceph_version(void) +{ + generic_dout(-1) << ceph_version_to_string() << dendl; +} + +void _dout_open_log() { // should hold _dout_lock here @@ -33,11 +47,6 @@ void _dout_open_log(bool print_version) _dout = new std::ostream(_doss); } - if (print_version) { - _doss->sputc(11); - *_dout << "ceph version " << VERSION << " (commit:" - << STRINGIFY(CEPH_GIT_VER) << ")" << std::endl; - } _dout_need_open = false; } @@ -46,7 +55,7 @@ int dout_handle_daemonize() DoutLocker _dout_locker; if (_dout_need_open) - _dout_open_log(true); + _dout_open_log(); assert(_doss); _doss->handle_stderr_closed(); @@ -58,7 +67,7 @@ int dout_create_rank_symlink(int n) DoutLocker _dout_locker; if (_dout_need_open) - _dout_open_log(true); + _dout_open_log(); assert(_doss); return _doss->create_rank_symlink(n); diff --git a/src/common/debug.h b/src/common/debug.h index ecca170b1e5b..d0a981326ef8 100644 --- a/src/common/debug.h +++ b/src/common/debug.h @@ -22,13 +22,18 @@ #include "include/assert.h" #include +#include extern std::ostream *_dout; extern DoutStreambuf *_doss; extern bool _dout_need_open; extern pthread_mutex_t _dout_lock; -extern void _dout_open_log(bool print_version); +extern std::string ceph_version_to_string(void); + +extern void dout_output_ceph_version(void); + +extern void _dout_open_log(); extern int dout_handle_daemonize(); @@ -47,7 +52,7 @@ public: static inline void _dout_begin_line(signed int prio) { if (unlikely(_dout_need_open)) - _dout_open_log(true); + _dout_open_log(); // Put priority information into dout _doss->sputc(prio + 12); diff --git a/src/config.cc b/src/config.cc index b96be8ec94de..ca802911b11f 100644 --- a/src/config.cc +++ b/src/config.cc @@ -1100,7 +1100,11 @@ void parse_startup_config_options(std::vector& args, // before initializing dout(). For now, just force a reopen here with the // configuration we have just read. DoutLocker _dout_locker; - _dout_open_log(false); + _dout_open_log(); + } + + if (!force_fg_logging) { + dout_output_ceph_version(); } if (!cf) diff --git a/src/test/cli/monmaptool/add-exists.t b/src/test/cli/monmaptool/add-exists.t index 5537234e9481..9bc74880514e 100644 --- a/src/test/cli/monmaptool/add-exists.t +++ b/src/test/cli/monmaptool/add-exists.t @@ -1,6 +1,5 @@ $ monmaptool --create mymonmap monmaptool: monmap file mymonmap - failed to open log file '/var/log/ceph/': error 21: Is a directory \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re) monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) monmaptool: writing epoch 1 to mymonmap (0 monitors) diff --git a/src/test/cli/monmaptool/add-many.t b/src/test/cli/monmaptool/add-many.t index 52a0137970d7..b272a10d81c9 100644 --- a/src/test/cli/monmaptool/add-many.t +++ b/src/test/cli/monmaptool/add-many.t @@ -1,6 +1,5 @@ $ monmaptool --create mymonmap monmaptool: monmap file mymonmap - failed to open log file '/var/log/ceph/': error 21: Is a directory \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re) monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) monmaptool: writing epoch 1 to mymonmap (0 monitors) diff --git a/src/test/cli/monmaptool/clobber.t b/src/test/cli/monmaptool/clobber.t index 34dd9952c3f4..9e93d7f2dc39 100644 --- a/src/test/cli/monmaptool/clobber.t +++ b/src/test/cli/monmaptool/clobber.t @@ -1,6 +1,5 @@ $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap monmaptool: monmap file mymonmap - failed to open log file '/var/log/ceph/': error 21: Is a directory \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re) monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) monmaptool: writing epoch 1 to mymonmap (1 monitors) diff --git a/src/test/cli/monmaptool/create-print.t b/src/test/cli/monmaptool/create-print.t index 186f08ee6182..70d77a79333d 100644 --- a/src/test/cli/monmaptool/create-print.t +++ b/src/test/cli/monmaptool/create-print.t @@ -1,6 +1,5 @@ $ monmaptool --create mymonmap monmaptool: monmap file mymonmap - failed to open log file '/var/log/ceph/': error 21: Is a directory \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re) monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) monmaptool: writing epoch 1 to mymonmap (0 monitors) diff --git a/src/test/cli/monmaptool/create-with-add.t b/src/test/cli/monmaptool/create-with-add.t index f710f9d4d3e3..0ef0d59c3590 100644 --- a/src/test/cli/monmaptool/create-with-add.t +++ b/src/test/cli/monmaptool/create-with-add.t @@ -1,6 +1,5 @@ $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap monmaptool: monmap file mymonmap - failed to open log file '/var/log/ceph/': error 21: Is a directory \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re) monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) monmaptool: writing epoch 1 to mymonmap (1 monitors) diff --git a/src/test/cli/monmaptool/help.t b/src/test/cli/monmaptool/help.t index 739ccf7339d2..2244c0052b9b 100644 --- a/src/test/cli/monmaptool/help.t +++ b/src/test/cli/monmaptool/help.t @@ -1,7 +1,6 @@ # TODO be user-friendly $ monmaptool --help monmaptool: monmap file --help - failed to open log file '/var/log/ceph/': error 21: Is a directory \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open --help: error 2: No such file or directory (re) monmaptool: couldn't open --help: Is a directory [255] diff --git a/src/test/cli/monmaptool/print-nonexistent.t b/src/test/cli/monmaptool/print-nonexistent.t index afc53e1e7970..74f0f5d2219f 100644 --- a/src/test/cli/monmaptool/print-nonexistent.t +++ b/src/test/cli/monmaptool/print-nonexistent.t @@ -1,6 +1,5 @@ $ monmaptool --print nonexistent monmaptool: monmap file nonexistent - failed to open log file '/var/log/ceph/': error 21: Is a directory \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open nonexistent: error 2: No such file or directory (re) monmaptool: couldn't open nonexistent: Is a directory [255] diff --git a/src/test/cli/monmaptool/rm-nonexistent.t b/src/test/cli/monmaptool/rm-nonexistent.t index ce86164f491b..df572881a490 100644 --- a/src/test/cli/monmaptool/rm-nonexistent.t +++ b/src/test/cli/monmaptool/rm-nonexistent.t @@ -1,6 +1,5 @@ $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap monmaptool: monmap file mymonmap - failed to open log file '/var/log/ceph/': error 21: Is a directory \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re) monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) monmaptool: writing epoch 1 to mymonmap (1 monitors) diff --git a/src/test/cli/monmaptool/rm.t b/src/test/cli/monmaptool/rm.t index b12a89127bcf..8e8732a8e505 100644 --- a/src/test/cli/monmaptool/rm.t +++ b/src/test/cli/monmaptool/rm.t @@ -1,6 +1,5 @@ $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap monmaptool: monmap file mymonmap - failed to open log file '/var/log/ceph/': error 21: Is a directory \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re) monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) monmaptool: writing epoch 1 to mymonmap (1 monitors)