]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5116 from yuyuyu101/wip-compressor
authorSage Weil <sage@redhat.com>
Tue, 28 Jul 2015 13:05:04 +0000 (09:05 -0400)
committerSage Weil <sage@redhat.com>
Tue, 28 Jul 2015 13:05:04 +0000 (09:05 -0400)
Wip compressor

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/Makefile.am
src/common/config_opts.h
src/test/Makefile.am

diff --cc src/Makefile.am
Simple merge
index b0dde869a8db9744cd1250ae8bc4f0f035a2064a,ea885346dc81dcbbf899ef29eb76c61dd9dbdc9e..d41e44df67f100e9bf7c93ce6135a1c53123ad24
@@@ -77,8 -77,13 +77,14 @@@ OPTION(xio_mp_max_page, OPT_INT, 4096) 
  OPTION(xio_mp_max_hint, OPT_INT, 4096) // max size-hint chunks
  OPTION(xio_portal_threads, OPT_INT, 2) // xio portal threads per messenger
  OPTION(xio_transport_type, OPT_STR, "rdma") // xio transport type: {rdma or tcp}
 +OPTION(xio_max_send_inline, OPT_INT, 512) // xio maximum threshold to send inline
  
+ OPTION(async_compressor_enabled, OPT_BOOL, false)
+ OPTION(async_compressor_type, OPT_STR, "snappy")
+ OPTION(async_compressor_threads, OPT_INT, 2)
+ OPTION(async_compressor_thread_timeout, OPT_INT, 5)
+ OPTION(async_compressor_thread_suicide_timeout, OPT_INT, 30)
  DEFAULT_SUBSYS(0, 5)
  SUBSYS(lockdep, 0, 1)
  SUBSYS(context, 0, 1)
Simple merge