From: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Date: Mon, 6 Jul 2009 04:23:44 +0000 (+0900)
Subject: Reduce "Cgroup change for PID:X, UID:X, GID:X FAILED!" messages.
X-Git-Tag: v0.35~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=898a4f46a4bc7b75209976b3c2fe6bafd6e2faa0;p=thirdparty%2Flibcgroup.git

Reduce "Cgroup change for PID:X, UID:X, GID:X FAILED!" messages.

Hi,

Changelog since v1:
===================
 * Rebase the latest code.
 * Cleanup.

The log message "Cgroup change for PID:X, UID:X, GID:X FAILED!" is output
by cgrulesengd daemon, even if a process finished already and that is not
a problem.
This patch prevents the daemon from outputting this spam log message.

* Reference
  [PATCH 2/2] Reduce "Cgroup change for PID:X, UID:X, GID:X FAILED!" messages.
  http://sourceforge.net/mailarchive/message.php?msg_name=4A10EE7E.60403%40mxs.nes.nec.co.jp

Thanks
Ken'ichi Ohmichi

Signed-off-by: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
---

diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c
index 00016e39..38e4f60f 100644
--- a/src/daemon/cgrulesengd.c
+++ b/src/daemon/cgrulesengd.c
@@ -432,11 +432,10 @@ int cgre_process_event(const struct proc_event *ev, const int type)
 		break;
 	}
 	ret = cgre_change_cgroup(euid, egid, procname, pid);
-	if (ret) {
-		/*
-		 * TODO: add some supression, do not spam log when every group
-		 * change fails
-		 */
+	if ((ret == ECGOTHER) && (errno == ESRCH)) {
+		/* A process finished already and that is not a problem. */
+		ret = 0;
+	} else if (ret) {
 		flog(LOG_WARNING, "Cgroup change for PID: %d, UID: %d, GID: %d"
 			" FAILED! (Error Code: %d)", log_pid, log_uid, log_gid,
 			ret);