diff options
| author | dormando <dormando@rydia.net> | 2020-03-08 15:02:56 -0700 |
|---|---|---|
| committer | dormando <dormando@rydia.net> | 2020-03-08 15:02:56 -0700 |
| commit | 936325b13c5fd354ce2820cec135755e7a13d092 (patch) | |
| tree | ba4bd3df1c62f89000da8680817ffb8282b5ab4e | |
| parent | 9c8a1f4766551e4b7760feba0dd175705669c9b8 (diff) | |
| download | memcached-1.6.0.tar.gz | |
extstore: enable by default.1.6.0
links to a forwarder for the wiki page.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | doc/storage.txt | 18 | ||||
| -rw-r--r-- | memcached.c | 1 |
3 files changed, 4 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index 376a131..f5b64fd 100644 --- a/configure.ac +++ b/configure.ac @@ -86,7 +86,7 @@ AC_ARG_ENABLE(arm_crc32, [AS_HELP_STRING([--enable-arm-crc32], [Enable ARMv8 CRC32 instructions])]) AC_ARG_ENABLE(extstore, - [AS_HELP_STRING([--enable-extstore], [Enable external storage EXPERIMENTAL ])]) + [AS_HELP_STRING([--disable-extstore], [Disable external storage (extstore)])]) AC_ARG_ENABLE(seccomp, [AS_HELP_STRING([--enable-seccomp],[Enable seccomp restrictions EXPERIMENTAL])]) @@ -190,7 +190,7 @@ if test "x$enable_dtrace" = "xyes"; then fi fi -if test "x$enable_extstore" = "xyes"; then +if test "x$enable_extstore" != "xno"; then AC_DEFINE([EXTSTORE],1,[Set to nonzero if you want to enable extstore]) fi @@ -209,7 +209,7 @@ fi AM_CONDITIONAL([BUILD_DTRACE],[test "$build_dtrace" = "yes"]) AM_CONDITIONAL([DTRACE_INSTRUMENT_OBJ],[test "$dtrace_instrument_obj" = "yes"]) AM_CONDITIONAL([ENABLE_SASL],[test "$enable_sasl" = "yes"]) -AM_CONDITIONAL([ENABLE_EXTSTORE],[test "$enable_extstore" = "yes"]) +AM_CONDITIONAL([ENABLE_EXTSTORE],[test "$enable_extstore" != "no"]) AM_CONDITIONAL([ENABLE_ARM_CRC32],[test "$enable_arm_crc32" = "yes"]) AM_CONDITIONAL([ENABLE_TLS],[test "$enable_tls" = "yes"]) AM_CONDITIONAL([ENABLE_ASAN],[test "$enable_asan" = "yes"]) diff --git a/doc/storage.txt b/doc/storage.txt index 8186b57..4f43cfe 100644 --- a/doc/storage.txt +++ b/doc/storage.txt @@ -114,21 +114,3 @@ write buffer is used, 8 megs are read back at once and iterated for objects. This needs a fair amount of tuning, possibly more throttling. It will still evict pages if the compactor gets behind. -TODO ----- - -Sharing my broad TODO items into here. While doing the work they get split up -more into local notes. Adding this so others can follow along: - -(a bunch of the TODO has been completed and removed) -- O_DIRECT support -- libaio support (requires O_DIRECT) -- JBOD support (not in first pass) - - 1-2 active pages per device. potentially dedicated IO threads per device. - with a RAID setup you risk any individual disk doing a GC pause stalling - all writes. could also simply rotate devices on a per-bucket basis. - -on memcached end: -- O_DIRECT support; mostly memalign pages, but also making chunks grow - aligned to sector sizes once they are >= a single sector. -- specify storage size by MB/G/T/etc instead of page count diff --git a/memcached.c b/memcached.c index 5a27984..80503de 100644 --- a/memcached.c +++ b/memcached.c @@ -7949,6 +7949,7 @@ static void usage(void) { #endif #endif #ifdef EXTSTORE + printf("\n - External storage (ext_*) related options (see: https://memcached.org/extstore)\n"); printf(" - ext_path: file to write to for external storage.\n" " ie: ext_path=/mnt/d1/extstore:1G\n" " - ext_page_size: size in megabytes of storage pages. (default: %u)\n" |