diff options
| author | Ryan Moats <rmoats@us.ibm.com> | 2016-08-03 19:07:38 +0000 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2016-08-13 22:11:12 -0700 |
| commit | cd423a77c655c941072ad355cfc7526d09fbe9b2 (patch) | |
| tree | c1db45c375f244b052ca0be7948d9dd4896829fa /ovsdb/execution.c | |
| parent | 0deb0f6d69d39bf436ffc2d4ff689f3ee905e01d (diff) | |
| download | openvswitch-cd423a77c655c941072ad355cfc7526d09fbe9b2.tar.gz | |
ovsdb: Use better error message for "timeout" without waiting.
When setting a where clause, if the timeout is set to a value of 0,
the clause is tested once and if it fails, a message of '"wait" timed
out' is returned. This can be misleading because there wasn't any
real time, so change the message to '"where" clause test failed'.
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Reported-by: Ryan Moats <rmoats@us.ibm.com>
Reported-at: http://openvswitch.org/pipermail/dev/2016-August/077083.html
Fixes: f85f8ebb ("Initial implementation of OVSDB.")
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ovsdb/execution.c')
| -rw-r--r-- | ovsdb/execution.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ovsdb/execution.c b/ovsdb/execution.c index e972ce7ad..af0e655ae 100644 --- a/ovsdb/execution.c +++ b/ovsdb/execution.c @@ -697,7 +697,8 @@ ovsdb_execute_wait(struct ovsdb_execution *x, struct ovsdb_parser *parser, "\"wait\" timed out after %lld ms", x->elapsed_msec); } else { - error = ovsdb_error("timed out", "\"wait\" timed out"); + error = ovsdb_error("timed out", + "\"where\" clause test failed"); } } else { /* ovsdb_execute() will change this, if triggers really are |