]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #45806 from hualongfeng/qat_error_fix1
authorCasey Bodley <cbodley@users.noreply.github.com>
Thu, 9 Jun 2022 14:50:24 +0000 (10:50 -0400)
committerGitHub <noreply@github.com>
Thu, 9 Jun 2022 14:50:24 +0000 (10:50 -0400)
common/compressor: fix the issue that read more data

Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/compressor/QatAccel.cc
src/compressor/zlib/ZlibCompressor.cc

Simple merge
index 3bedbd8a1ebbdb6b21490897b51933c86da167ba,4482f44e2bac702c87f97eab5aa46c2f709374d6..6e2374016e0866b759aabf76f6808387ccce5d50
@@@ -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