fix log error of userspace iosocket (#18687)

Signed-off-by: YaoZengzeng <yaozengzeng@huawei.com>
envoyproxy · Oct 25, 2021 · 8cf8121 · 8cf8121
1 parent 72c4d59
commit 8cf8121
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/source/common/buffer/watermark_buffer.h b/source/common/buffer/watermark_buffer.h
@@ -67,7 +67,7 @@ class WatermarkBuffer : public OwnedImpl {
   uint32_t low_watermark_{0};
   uint32_t overflow_watermark_{0};
   // Tracks the latest state of watermark callbacks.
-  // True between the time above_high_watermark_ has been called until above_high_watermark_ has
+  // True between the time above_high_watermark_ has been called until below_low_watermark_ has
   // been called.
   bool above_high_watermark_called_{false};
   // Set to true when above_overflow_watermark_ is called (and isn't cleared).

diff --git a/source/extensions/io_socket/user_space/file_event_impl.cc b/source/extensions/io_socket/user_space/file_event_impl.cc
@@ -58,7 +58,7 @@ void FileEventImpl::setEnabled(uint32_t events) {
   ENVOY_LOG(
       trace,
       "User space file event {} set enabled events {} and events {} is active. Will {} reschedule.",
-      static_cast<void*>(this), events, was_enabled ? "not " : "");
+      static_cast<void*>(this), events, events_to_notify, was_enabled ? "not " : "");
 }
 
 void FileEventImpl::activateIfEnabled(uint32_t events) {

diff --git a/source/extensions/io_socket/user_space/io_handle_impl.cc b/source/extensions/io_socket/user_space/io_handle_impl.cc
@@ -150,7 +150,7 @@ Api::IoCallUint64Result IoHandleImpl::writev(const Buffer::RawSlice* slices, uin
   }
   if (is_input_empty) {
     return Api::ioCallUint64ResultNoError();
-  };
+  }
   if (!isOpen()) {
     return {0, Api::IoErrorPtr(new Network::IoSocketError(SOCKET_ERROR_BADF),
                                Network::IoSocketError::deleteIoError)};