From 3c6ab63772ad50aee17327941f3210b662b563ef Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Wed, 25 Mar 2020 08:44:18 +0000 Subject: [PATCH] test/erasure-code: remove ceph_erasure_code Its functionality is moved to ceph-erasure-code-tool. Signed-off-by: Mykola Golub (cherry picked from commit 56aaaf8a97574a0284bad37cc0ba5e1c262f33e0) --- alpine/APKBUILD.in | 1 - ceph.spec.in | 1 - debian/ceph-test.install | 1 - src/test/CMakeLists.txt | 1 - src/test/erasure-code/CMakeLists.txt | 5 - src/test/erasure-code/ceph_erasure_code.cc | 201 --------------------- 6 files changed, 210 deletions(-) delete mode 100644 src/test/erasure-code/ceph_erasure_code.cc diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in index 9348f9ccf9147..a9a9a58ecfced 100644 --- a/alpine/APKBUILD.in +++ b/alpine/APKBUILD.in @@ -415,7 +415,6 @@ ceph_test() { ceph_bench_log \ ceph_kvstorebench \ ceph_multi_stress_watch \ - ceph_erasure_code \ ceph_erasure_code_benchmark \ ceph_omapbench \ ceph_objectstore_bench \ diff --git a/ceph.spec.in b/ceph.spec.in index d6398c643d6dd..f35bbe6002f71 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -2176,7 +2176,6 @@ fi %{_bindir}/ceph_bench_log %{_bindir}/ceph_kvstorebench %{_bindir}/ceph_multi_stress_watch -%{_bindir}/ceph_erasure_code %{_bindir}/ceph_erasure_code_benchmark %{_bindir}/ceph_omapbench %{_bindir}/ceph_objectstore_bench diff --git a/debian/ceph-test.install b/debian/ceph-test.install index dae063ab6c425..52e2901050113 100644 --- a/debian/ceph-test.install +++ b/debian/ceph-test.install @@ -1,7 +1,6 @@ usr/bin/ceph-client-debug usr/bin/ceph-coverage usr/bin/ceph_bench_log -usr/bin/ceph_erasure_code usr/bin/ceph_erasure_code_benchmark usr/bin/ceph_kvstorebench usr/bin/ceph_multi_stress_watch diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 3ae4120bdc95d..7f9c97d5f7beb 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -487,7 +487,6 @@ add_dependencies(tests cls_lock ceph_test_objectstore ceph_erasure_code_non_regression - ceph_erasure_code cython_modules) if (WITH_CEPHFS) add_dependencies(tests ceph-mds) diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt index 49f12adc9184a..640de24bd5fc3 100644 --- a/src/test/erasure-code/CMakeLists.txt +++ b/src/test/erasure-code/CMakeLists.txt @@ -9,11 +9,6 @@ install(TARGETS ceph_erasure_code_benchmark add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc) target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) -add_executable(ceph_erasure_code ceph_erasure_code.cc) -target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) -install(TARGETS ceph_erasure_code - DESTINATION bin) - add_library(ec_example SHARED ErasureCodePluginExample.cc $) diff --git a/src/test/erasure-code/ceph_erasure_code.cc b/src/test/erasure-code/ceph_erasure_code.cc deleted file mode 100644 index 1f2fb61e6d788..0000000000000 --- a/src/test/erasure-code/ceph_erasure_code.cc +++ /dev/null @@ -1,201 +0,0 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -// vim: ts=8 sw=2 smarttab -/* - * Ceph distributed storage system - * - * Copyright (C) 2014 Cloudwatt - * Copyright (C) 2014 Red Hat - * - * Author: Loic Dachary - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "global/global_context.h" -#include "global/global_init.h" -#include "common/ceph_argparse.h" -#include "common/ceph_context.h" -#include "common/config.h" -#include "common/Clock.h" -#include "include/utime.h" -#include "erasure-code/ErasureCodePlugin.h" - -namespace po = boost::program_options; - -class ErasureCodeCommand { - po::variables_map vm; - ErasureCodeProfile profile; - boost::intrusive_ptr cct; -public: - int setup(int argc, char** argv); - int run(); - int plugin_exists(); - int display_information(); -}; - -int ErasureCodeCommand::setup(int argc, char** argv) { - - po::options_description desc("Allowed options"); - desc.add_options() - ("help,h", "produce help message") - ("all", "implies " - "--get_chunk_size 1024 " - "--get_data_chunk_count " - "--get_coding_chunk_count " - "--get_chunk_count ") - ("get_chunk_size", po::value(), - "display get_chunk_size()") - ("get_data_chunk_count", "display get_data_chunk_count()") - ("get_coding_chunk_count", "display get_coding_chunk_count()") - ("get_chunk_count", "display get_chunk_count()") - ("parameter,P", po::value >(), - "parameters") - ("plugin_exists", po::value(), - "succeeds if the plugin given in argument exists and can be loaded") - ; - - po::parsed_options parsed = - po::command_line_parser(argc, argv).options(desc).allow_unregistered().run(); - po::store( - parsed, - vm); - po::notify(vm); - - vector ceph_options; - vector ceph_option_strings = po::collect_unrecognized( - parsed.options, po::include_positional); - ceph_options.reserve(ceph_option_strings.size()); - for (vector::iterator i = ceph_option_strings.begin(); - i != ceph_option_strings.end(); - ++i) { - ceph_options.push_back(i->c_str()); - } - - cct = global_init( - NULL, ceph_options, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, - CINIT_FLAG_NO_MON_CONFIG); - common_init_finish(g_ceph_context); - g_ceph_context->_conf.apply_changes(nullptr); - - if (vm.count("help")) { - cout << desc << std::endl; - return 1; - } - - if (vm.count("parameter")) { - const vector &p = vm["parameter"].as< vector >(); - for (vector::const_iterator i = p.begin(); - i != p.end(); - ++i) { - std::vector strs; - boost::split(strs, *i, boost::is_any_of("=")); - if (strs.size() != 2) { - cerr << "--parameter " << *i - << " ignored because it does not contain exactly one =" << endl; - } else { - profile[strs[0]] = strs[1]; - } - } - } - - return 0; -} - -int ErasureCodeCommand::run() { - if (vm.count("plugin_exists")) - return plugin_exists(); - else - return display_information(); -} - -int ErasureCodeCommand::plugin_exists() { - ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance(); - ErasureCodePlugin *plugin = 0; - std::lock_guard l{instance.lock}; - stringstream ss; - int code = instance.load(vm["plugin_exists"].as(), - g_conf().get_val("erasure_code_dir"), &plugin, &ss); - if (code) - cerr << ss.str() << endl; - return code; -} - -int ErasureCodeCommand::display_information() { - ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance(); - ErasureCodeInterfaceRef erasure_code; - - if (profile.count("plugin") == 0) { - cerr << "--parameter plugin= is mandatory" << endl; - return 1; - } - - int code = instance.factory(profile["plugin"], - g_conf().get_val("erasure_code_dir"), - profile, - &erasure_code, &cerr); - if (code) - return code; - - if (vm.count("all") || vm.count("get_chunk_size")) { - unsigned int object_size = 1024; - if (vm.count("get_chunk_size")) - object_size = vm["get_chunk_size"].as(); - cout << "get_chunk_size(" << object_size << ")\t" - << erasure_code->get_chunk_size(object_size) << endl; - } - if (vm.count("all") || vm.count("get_data_chunk_count")) - cout << "get_data_chunk_count\t" - << erasure_code->get_data_chunk_count() << endl; - if (vm.count("all") || vm.count("get_coding_chunk_count")) - cout << "get_coding_chunk_count\t" - << erasure_code->get_coding_chunk_count() << endl; - if (vm.count("all") || vm.count("get_chunk_count")) - cout << "get_chunk_count\t" - << erasure_code->get_chunk_count() << endl; - return 0; -} - -int main(int argc, char** argv) { - ErasureCodeCommand eccommand; - try { - int err = eccommand.setup(argc, argv); - if (err) - return err; - return eccommand.run(); - } catch(po::error &e) { - cerr << e.what() << endl; - return 1; - } -} - -/* - * Local Variables: - * compile-command: "cd ../.. ; make -j4 && - * make -j4 ceph_erasure_code && - * libtool --mode=execute valgrind --tool=memcheck --leak-check=full \ - * ./ceph_erasure_code \ - * --parameter plugin=jerasure \ - * --parameter technique=reed_sol_van \ - * --parameter k=2 \ - * --parameter m=2 \ - * --get_chunk_size 1024 \ - * --get_data_chunk_count \ - * --get_coding_chunk_count \ - * --get_chunk_count \ - * " - * End: - */ -- 2.39.5