Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add grpc stop for flip service in homestore. #276

Closed
wants to merge 1 commit into from
+11 −6
Closed

Add grpc stop for flip service in homestore. #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class HomestoreConan(ConanFile):
name = "homestore"
version = "5.0.2"
version = "5.0.3"
homepage = "https://github.com/eBay/Homestore"
description = "HomeStore Storage Engine"
topics = ("ebay", "nublox")
Expand Down
6 changes: 5 additions & 1 deletion src/lib/homestore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ void HomeStore::shutdown() {

if (has_index_service()) {
m_index_service->stop();
// m_index_service.reset();
// m_index_service.reset();
}

if (has_log_service()) {
Expand All @@ -258,6 +258,10 @@ void HomeStore::shutdown() {
m_dev_mgr->close_devices();
m_dev_mgr.reset();

#ifdef _PRERELEASE
flip::Flip::instance().stop_rpc_server();
#endif

HomeStore::reset_instance();
LOGINFO("Homestore is completed its shutdown");
}
Expand Down
9 changes: 5 additions & 4 deletions src/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ if (${build_nonio_tests})
set(TEST_MEMBTREE_SOURCE_FILES test_mem_btree.cpp)
add_executable(test_mem_btree ${TEST_MEMBTREE_SOURCE_FILES})
target_link_libraries(test_mem_btree ${COMMON_TEST_DEPS} GTest::gtest)
# add_test(NAME MemBtree COMMAND test_mem_btree)
# set_tests_properties(MemBtree PROPERTIES TIMEOUT 180)
add_test(NAME MemBtree COMMAND test_mem_btree)
set_tests_properties(MemBtree PROPERTIES TIMEOUT 600)

add_executable(test_blk_read_tracker)
target_sources(test_blk_read_tracker PRIVATE test_blk_read_tracker.cpp ../lib/blkdata_svc/blk_read_tracker.cpp ../lib/blkalloc/blk.cpp)
Expand Down Expand Up @@ -72,8 +72,9 @@ if (${io_tests})
set(TEST_INDEXBTREE_SOURCE_FILES test_index_btree.cpp)
add_executable(test_index_btree ${TEST_INDEXBTREE_SOURCE_FILES})
target_link_libraries(test_index_btree homestore ${COMMON_TEST_DEPS} GTest::gtest)
# add_test(NAME IndexBtree COMMAND test_index_btree)
# set_property(TEST IndexBtree PROPERTY ENVIRONMENT "ASAN_OPTIONS=detect_stack_use_after_return=true")
add_test(NAME IndexBtree COMMAND test_index_btree)
set_property(TEST IndexBtree PROPERTY ENVIRONMENT "ASAN_OPTIONS=detect_stack_use_after_return=true")
set_tests_properties(IndexBtree PROPERTIES TIMEOUT 600)

add_executable(test_data_service)
target_sources(test_data_service PRIVATE test_data_service.cpp)
Expand Down
Loading