nfsdcltrack: silence some expected errors (bz 1445863)
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
parent
8de6133880
commit
d356fbe097
37
nfs-utils-2.1.1-nfsdcltrack-errors.patch
Normal file
37
nfs-utils-2.1.1-nfsdcltrack-errors.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
commit 06bbb4ee6f5186e8e83d50767ad5b3b41968e5a6
|
||||||
|
Author: Jeff Layton <jlayton@redhat.com>
|
||||||
|
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 <chunwang@redhat.com>
|
||||||
|
Signed-off-by: Jeff Layton <jlayton@redhat.com>
|
||||||
|
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||||
|
|
||||||
|
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;
|
@ -17,6 +17,7 @@ Source5: 24-nfs-server.conf
|
|||||||
|
|
||||||
Patch001: nfs-utils-2.1.2-rc2.patch
|
Patch001: nfs-utils-2.1.2-rc2.patch
|
||||||
Patch002: nfs-utils-2.1.1-network-online.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
|
Patch100: nfs-utils-1.2.1-statdpath-man.patch
|
||||||
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.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
|
%patch001 -p1
|
||||||
%patch002 -p1
|
%patch002 -p1
|
||||||
|
%patch003 -p1
|
||||||
|
|
||||||
%patch100 -p1
|
%patch100 -p1
|
||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
@ -293,6 +295,7 @@ fi
|
|||||||
* Wed Apr 26 2017 Steve Dickson <steved@redhat.com> 2.1.1-5.rc2
|
* Wed Apr 26 2017 Steve Dickson <steved@redhat.com> 2.1.1-5.rc2
|
||||||
- Conditionally restart gssproxy now that config file is installed (bz 1440885)
|
- Conditionally restart gssproxy now that config file is installed (bz 1440885)
|
||||||
- systemd: Afters are also needed for the Wants=network-online.target (bz 1419351)
|
- 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 <steved@redhat.com> 2.1.1-4.rc2
|
* Mon Apr 10 2017 Steve Dickson <steved@redhat.com> 2.1.1-4.rc2
|
||||||
- Updated to the latest RC release: nfs-utils-2-1-2-rc2 (bz 1419351)
|
- Updated to the latest RC release: nfs-utils-2-1-2-rc2 (bz 1419351)
|
||||||
|
Loading…
Reference in New Issue
Block a user