Skip to content

Commit 41ff58d

Browse files
authored
refactor(FDS): Terminate the FDS supporting (#1695)
#1644 As it known, the [FDS](https://docs.api.xiaomi.com/fds/introduction.html) is a Xiaomi internal storage system, the community users are not possible to use FDS as a [Backup](https://pegasus.apache.org/zh/administration/cold-backup) target, and since Pegasus [2.2.0](https://github.com/apache/incubator-pegasus/releases/tag/v2.2.0) (released in Jun, 2021), the Backup start to support using Apache HDFS as the target storage. This patch terminates the supporting of FDS in the next version. Of course, we will still fix critical bugs if there are in released versions. TODO: backup/restore modules have to update.
1 parent 2ff8c02 commit 41ff58d

29 files changed

+2
-1889
lines changed

.licenserc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ header:
6565
- 'src/replica/duplication/test/log.1.0.handle_real_private_log2'
6666
- 'src/replica/duplication/test/log.1.0.all_loaded_are_write_empties'
6767
# Used for patches for thirdparties.
68-
- 'thirdparty/fix_fds_for_macos.patch'
6968
- 'thirdparty/fix_jemalloc_for_m1_on_macos.patch'
7069
- 'thirdparty/fix_libevent_for_macos.patch'
7170
- 'thirdparty/fix_prometheus-cpp_limits.patch'

cmake_modules/BaseFunctions.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,6 @@ function(dsn_setup_compiler_flags)
222222
# use frame pointers to allow simple stack frame walking for backtraces.
223223
# This has a small perf hit but worth it for the ability to profile in production
224224
add_compile_options( -fno-omit-frame-pointer)
225-
# -Wno-implicit-float-conversion
226-
# Poco/Dynamic/VarHolder.h uses 'unsigned long' to 'float' conversion
227-
add_compile_options(-Wno-implicit-float-conversion)
228225

229226
find_program(CCACHE_FOUND ccache)
230227
if(CCACHE_FOUND)

scripts/pack_server.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ copy_file ${BUILD_LATEST_DIR}/output/bin/pegasus_server/pegasus_server ${pack}/b
114114
copy_file ${BUILD_LATEST_DIR}/output/lib/libdsn_meta_server.so ${pack}/bin
115115
copy_file ${BUILD_LATEST_DIR}/output/lib/libdsn_replica_server.so ${pack}/bin
116116
copy_file ${BUILD_LATEST_DIR}/output/lib/libdsn_utils.so ${pack}/bin
117-
copy_file ./thirdparty/output/lib/libPoco*.so.* ${pack}/bin
118117

119118
if [ "$use_jemalloc" == "on" ]; then
120119
copy_file ./thirdparty/output/lib/libjemalloc.so.2 ${pack}/bin

scripts/pack_tools.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ cp -v -r ${BUILD_LATEST_DIR}/output/bin/pegasus_pressureclient ${pack}/bin/
123123

124124
mkdir -p ${pack}/lib
125125
copy_file ${BUILD_LATEST_DIR}/output/lib/*.so* ${pack}/lib/
126-
copy_file ./thirdparty/output/lib/libPoco*.so.* ${pack}/lib/
127126

128127
if [ "$use_jemalloc" == "on" ]; then
129128
copy_file ./thirdparty/output/lib/libjemalloc.so.2 ${pack}/lib/

src/block_service/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ set(MY_BOOST_LIBS Boost::system Boost::filesystem)
3737

3838
dsn_add_static_library()
3939

40-
add_subdirectory(fds)
4140
add_subdirectory(hdfs)
4241
add_subdirectory(local)
4342
add_subdirectory(test)

src/block_service/block_service_manager.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <vector>
2323

2424
#include "block_service/block_service.h"
25-
#include "block_service/fds/fds_service.h"
2625
#include "block_service/hdfs/hdfs_service.h"
2726
#include "block_service/local/local_service.h"
2827
#include "runtime/task/task_code.h"
@@ -39,10 +38,6 @@ namespace block_service {
3938

4039
block_service_registry::block_service_registry()
4140
{
42-
CHECK(utils::factory_store<block_filesystem>::register_factory(
43-
"fds_service", block_filesystem::create<fds_service>, PROVIDER_TYPE_MAIN),
44-
"register fds_service failed");
45-
4641
CHECK(utils::factory_store<block_filesystem>::register_factory(
4742
"hdfs_service", block_filesystem::create<hdfs_service>, PROVIDER_TYPE_MAIN),
4843
"register hdfs_service failed");

src/block_service/fds/CMakeLists.txt

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)