From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Thu, 9 Jun 2022 14:50:24 +0000 (-0400)
Subject: Merge pull request #45806 from hualongfeng/qat_error_fix1
X-Git-Tag: v18.0.0~728
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16b73f58c675f4b9fbeeb27ac7e3b166b0f7a6af;p=ceph.git

Merge pull request #45806 from hualongfeng/qat_error_fix1

common/compressor: fix the issue that read more data

Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

16b73f58c675f4b9fbeeb27ac7e3b166b0f7a6af
diff --cc src/compressor/zlib/ZlibCompressor.cc
index 3bedbd8a1ebb,4482f44e2bac..6e2374016e08
--- a/src/compressor/zlib/ZlibCompressor.cc
+++ b/src/compressor/zlib/ZlibCompressor.cc
@@@ -184,10 -184,11 +184,11 @@@ int ZlibCompressor::compress(const buff
  #endif
  }
  
 -int ZlibCompressor::decompress(bufferlist::const_iterator &p, size_t compressed_size, bufferlist &out, boost::optional<int32_t> compressor_message)
 +int ZlibCompressor::decompress(bufferlist::const_iterator &p, size_t compressed_size, bufferlist &out, std::optional<int32_t> compressor_message)
  {
  #ifdef HAVE_QATZIP
-   if (qat_enabled)
+   // QAT can only decompress with the default window size
+   if (qat_enabled && (!compressor_message || *compressor_message == ZLIB_DEFAULT_WIN_SIZE))
      return qat_accel.decompress(p, compressed_size, out, compressor_message);
  #endif