Disable FLASH
This commit is contained in:
parent
1f958ac63d
commit
39974223eb
6
deps/Makefile
vendored
6
deps/Makefile
vendored
@ -101,11 +101,11 @@ jemalloc: .make-prerequisites
|
|||||||
.PHONY: jemalloc
|
.PHONY: jemalloc
|
||||||
|
|
||||||
rocksdb: .make-prerequisites
|
rocksdb: .make-prerequisites
|
||||||
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
|
# @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
|
||||||
ifeq ($(uname_M),x86_64)
|
ifeq ($(uname_M),x86_64)
|
||||||
cd rocksdb && CFLAGS=-Wno-error PORTABLE=1 USE_SSE=1 FORCE_SSE42=1 $(MAKE) static_lib
|
# cd rocksdb && CFLAGS=-Wno-error PORTABLE=1 USE_SSE=1 FORCE_SSE42=1 $(MAKE) static_lib
|
||||||
else
|
else
|
||||||
cd rocksdb && PORTABLE=1 $(MAKE) static_lib
|
# cd rocksdb && PORTABLE=1 $(MAKE) static_lib
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: rocksdb
|
.PHONY: rocksdb
|
||||||
|
@ -366,7 +366,7 @@ endif
|
|||||||
|
|
||||||
REDIS_SERVER_NAME=keydb-server$(PROG_SUFFIX)
|
REDIS_SERVER_NAME=keydb-server$(PROG_SUFFIX)
|
||||||
REDIS_SENTINEL_NAME=keydb-sentinel$(PROG_SUFFIX)
|
REDIS_SENTINEL_NAME=keydb-sentinel$(PROG_SUFFIX)
|
||||||
REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o t_nhash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o acl.o storage.o rdb-s3.o fastlock.o new.o tracking.o cron.o connection.o tls.o sha256.o motd_server.o timeout.o setcpuaffinity.o AsyncWorkQueue.o snapshot.o storage/rocksdb.o storage/rocksdbfactory.o storage/teststorageprovider.o keydbutils.o StorageCache.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ)
|
REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o t_nhash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o acl.o storage.o rdb-s3.o fastlock.o new.o tracking.o cron.o connection.o tls.o sha256.o motd_server.o timeout.o setcpuaffinity.o AsyncWorkQueue.o snapshot.o storage/teststorageprovider.o keydbutils.o StorageCache.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ)
|
||||||
KEYDB_SERVER_OBJ=SnapshotPayloadParseState.o
|
KEYDB_SERVER_OBJ=SnapshotPayloadParseState.o
|
||||||
REDIS_CLI_NAME=keydb-cli$(PROG_SUFFIX)
|
REDIS_CLI_NAME=keydb-cli$(PROG_SUFFIX)
|
||||||
REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o redis-cli-cpphelper.o zmalloc.o release.o anet.o ae.o crcspeed.o crc64.o siphash.o crc16.o storage-lite.o fastlock.o motd_client.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ)
|
REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o redis-cli-cpphelper.o zmalloc.o release.o anet.o ae.o crcspeed.o crc64.o siphash.o crc16.o storage-lite.o fastlock.o motd_client.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ)
|
||||||
@ -427,7 +427,7 @@ endif
|
|||||||
|
|
||||||
# keydb-server
|
# keydb-server
|
||||||
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) $(KEYDB_SERVER_OBJ)
|
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) $(KEYDB_SERVER_OBJ)
|
||||||
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/rocksdb/librocksdb.a $(FINAL_LIBS)
|
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
|
||||||
|
|
||||||
# keydb-sentinel
|
# keydb-sentinel
|
||||||
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
|
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
|
||||||
|
@ -355,6 +355,11 @@ bool initializeStorageProvider(const char **err)
|
|||||||
return true;
|
return true;
|
||||||
if (!strcasecmp(g_sdsProvider, "flash") && g_sdsArgs != nullptr)
|
if (!strcasecmp(g_sdsProvider, "flash") && g_sdsArgs != nullptr)
|
||||||
{
|
{
|
||||||
|
// Temporary: Disable FLASH
|
||||||
|
serverLog(LL_WARNING, "FLASH Is Not yet Supported");
|
||||||
|
_Exit(EXIT_FAILURE);
|
||||||
|
|
||||||
|
|
||||||
// Create The Storage Factory (if necessary)
|
// Create The Storage Factory (if necessary)
|
||||||
serverLog(LL_NOTICE, "Initializing FLASH storage provider (this may take a long time)");
|
serverLog(LL_NOTICE, "Initializing FLASH storage provider (this may take a long time)");
|
||||||
adjustOpenFilesLimit();
|
adjustOpenFilesLimit();
|
||||||
|
@ -47,7 +47,6 @@ set ::all_tests {
|
|||||||
integration/replication-3
|
integration/replication-3
|
||||||
integration/replication-4
|
integration/replication-4
|
||||||
integration/replication-psync
|
integration/replication-psync
|
||||||
integration/replication-psync-flash
|
|
||||||
integration/replication-active
|
integration/replication-active
|
||||||
integration/replication-multimaster
|
integration/replication-multimaster
|
||||||
integration/replication-multimaster-connect
|
integration/replication-multimaster-connect
|
||||||
@ -60,13 +59,11 @@ set ::all_tests {
|
|||||||
integration/failover
|
integration/failover
|
||||||
integration/keydb-cli
|
integration/keydb-cli
|
||||||
integration/keydb-benchmark
|
integration/keydb-benchmark
|
||||||
integration/replication-fast
|
|
||||||
integration/replication-psync-multimaster
|
integration/replication-psync-multimaster
|
||||||
unit/pubsub
|
unit/pubsub
|
||||||
unit/slowlog
|
unit/slowlog
|
||||||
unit/scripting
|
unit/scripting
|
||||||
unit/maxmemory
|
unit/maxmemory
|
||||||
unit/flash
|
|
||||||
unit/introspection
|
unit/introspection
|
||||||
unit/introspection-2
|
unit/introspection-2
|
||||||
unit/limits
|
unit/limits
|
||||||
|
Loading…
x
Reference in New Issue
Block a user