[Pkg-ceph-commits] [ceph] 01/01: New backported patch to prevent `ceph-conf` from making log files.

[Dmitry Smirnov]

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch experimental
in repository ceph.

commit 1eb1907 (experimental)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Thu Mar 27 20:02:55 2014

    New backported patch to prevent `ceph-conf` from making log files.
---
 debian/patches/ceph-conf-no-log.patch | 38 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/ceph-conf-no-log.patch b/debian/patches/ceph-conf-no-log.patch
new file mode 100644
index 0000000..859b4cb
--- /dev/null
+++ b/debian/patches/ceph-conf-no-log.patch
@@ -0,0 +1,38 @@
+Last-Update: 2014-03-28
+Forwarded: not-needed
+Origin: upstream, http://tracker.ceph.com/projects/ceph/repository/revisions/acc31e75a3e7115c00f9980609948455e3b2d49e/diff/
+Origin: upstream, http://tracker.ceph.com/projects/ceph/repository/revisions/72715b235a0daee7ab8e5cd3ab6e415de2939df9/diff/
+Bug-Ceph: http://tracker.ceph.com/issues/7849
+Author: Sage Weil <sage at inktank.com>
+Description: prevent 'ceph-conf' from making log files
+    Subject: ceph-conf: do not log
+    .
+    If you are querying the conf for an osd and it has a log configured, we
+    should not generate any log activity.
+    .
+    This isn't super pretty, but it is much less intrusive that wiring a 'do
+    not log' flag down into CephContext and a zillion other places.
+    .
+    Subject: ceph-conf: no admin_socket
+    .
+    We don't need to worry about pidfile because that is done by the fork
+    functions, which ceph-conf doesn't call.
+
+--- a/src/tools/ceph_conf.cc
++++ b/src/tools/ceph_conf.cc
+@@ -157,8 +157,15 @@
+   argv_to_vec(argc, argv, args);
+   env_to_vec(args);
+   vector<const char*> orig_args = args;
+ 
++  args.push_back("--log-file");
++  args.push_back("");
++  args.push_back("--no-log-to-stderr");
++  args.push_back("--no-log-to-syslog");
++  args.push_back("--admin-socket");
++  args.push_back("");
++
+   global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON,
+ 	      CINIT_FLAG_NO_DAEMON_ACTIONS);
+ 
+   // do not common_init_finish(); do not start threads; do not do any of thing
diff --git a/debian/patches/series b/debian/patches/series
index 511a972..37347c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+ceph-conf-no-log.patch
 #defaults-leveldb-osd.patch
 fix-defaultweight.patch
 gcj.patch

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git