d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libdevdctl: Force full match of "timestamp" field name

Browse Source 
OpenZFS generates events with a "zio_timestamp" field, which gets mistaken for
"timestamp" by libdevdctl due to imprecise string matching.  Then later it is
assumed a "timestamp" field exists when it doesn't and an exception is thrown.

Add a space to the search string so we match exactly "timestamp" rather than
anything with that as a suffix.

Approved by:	mav (mentor)
MFC after:	3 days
Sponsored by:	iXsystems, Inc.
This commit is contained in:
Ryan Moeller 2020-06-23 16:29:59 +00:00
parent aa5e1b42e6
commit 5f018c9147
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libdevdctl/event.cc
View File

@ -427,7 +427,7 @@ Event::TimestampEventString(std::string &eventString)
* Add a timestamp as the final field of the event if it is * Add a timestamp as the final field of the event if it is
* not already present. * not already present.
*/ */
if (eventString.find("timestamp=") == string::npos) { if (eventString.find(" timestamp=") == string::npos) {
const size_t bufsize = 32; // Long enough for a 64-bit int const size_t bufsize = 32; // Long enough for a 64-bit int
timeval now; timeval now;
char timebuf[bufsize]; char timebuf[bufsize];