From d356fbe097f91784bd16cd270332340084cfc703 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Wed, 26 Apr 2017 12:44:15 -0400 Subject: [PATCH] nfsdcltrack: silence some expected errors (bz 1445863) Signed-off-by: Steve Dickson --- nfs-utils-2.1.1-nfsdcltrack-errors.patch | 37 ++++++++++++++++++++++++ nfs-utils.spec | 3 ++ 2 files changed, 40 insertions(+) create mode 100644 nfs-utils-2.1.1-nfsdcltrack-errors.patch diff --git a/nfs-utils-2.1.1-nfsdcltrack-errors.patch b/nfs-utils-2.1.1-nfsdcltrack-errors.patch new file mode 100644 index 0000000..54af57f --- /dev/null +++ b/nfs-utils-2.1.1-nfsdcltrack-errors.patch @@ -0,0 +1,37 @@ +commit 06bbb4ee6f5186e8e83d50767ad5b3b41968e5a6 +Author: Jeff Layton +Date: Wed Apr 26 12:13:50 2017 -0400 + + nfsdcltrack: silence some expected errors + + On a new install, we're unable to select from the parameters table, as + it doesn't exist yet. The code is set up to log that fact at L_ERROR + now, but it's an expected situation. Change it to log that at D_GENERAL + instead. + + Reported-and-Tested-by: ChunYu Wang + Signed-off-by: Jeff Layton + Signed-off-by: Steve Dickson + +diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c +index 54cd748..1552eba 100644 +--- a/utils/nfsdcltrack/sqlite.c ++++ b/utils/nfsdcltrack/sqlite.c +@@ -101,7 +101,7 @@ sqlite_query_schema_version(void) + "SELECT value FROM parameters WHERE key == \"version\";", + -1, &stmt, NULL); + if (ret != SQLITE_OK) { +- xlog(L_ERROR, "Unable to prepare select statement: %s", ++ xlog(D_GENERAL, "Unable to prepare select statement: %s", + sqlite3_errmsg(dbh)); + ret = 0; + goto out; +@@ -110,7 +110,7 @@ sqlite_query_schema_version(void) + /* query schema version */ + ret = sqlite3_step(stmt); + if (ret != SQLITE_ROW) { +- xlog(L_ERROR, "Select statement execution failed: %s", ++ xlog(D_GENERAL, "Select statement execution failed: %s", + sqlite3_errmsg(dbh)); + ret = 0; + goto out; diff --git a/nfs-utils.spec b/nfs-utils.spec index 3df5c1e..acfd147 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -17,6 +17,7 @@ Source5: 24-nfs-server.conf Patch001: nfs-utils-2.1.2-rc2.patch Patch002: nfs-utils-2.1.1-network-online.patch +Patch003: nfs-utils-2.1.1-nfsdcltrack-errors.patch Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch @@ -77,6 +78,7 @@ This package also contains the mount.nfs and umount.nfs program. %patch001 -p1 %patch002 -p1 +%patch003 -p1 %patch100 -p1 %patch101 -p1 @@ -293,6 +295,7 @@ fi * Wed Apr 26 2017 Steve Dickson 2.1.1-5.rc2 - Conditionally restart gssproxy now that config file is installed (bz 1440885) - systemd: Afters are also needed for the Wants=network-online.target (bz 1419351) +- nfsdcltrack: silence some expected errors (bz 1445863) * Mon Apr 10 2017 Steve Dickson 2.1.1-4.rc2 - Updated to the latest RC release: nfs-utils-2-1-2-rc2 (bz 1419351)