From ba405c9226d53d939d07c51e85e76d8d19bbcb09 Mon Sep 17 00:00:00 2001 From: Urmas Rist Date: Mon, 16 Sep 2024 14:30:12 +0300 Subject: [PATCH] Revert "fix(uraft): Fix missing floating ip address" This reverts commit 161f889c10e438b2762610747755e790ca22767b. --- src/uraft/main.cc | 11 +---------- src/uraft/saunafs-uraft-helper.in | 5 ----- src/uraft/uraftcontroller.h | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/uraft/main.cc b/src/uraft/main.cc index d46a4c89c..68ae94973 100644 --- a/src/uraft/main.cc +++ b/src/uraft/main.cc @@ -48,8 +48,7 @@ void parseOptions(int argc, char **argv, uRaftController::Options &opt, bool &ma ("URAFT_DEMOTE_TIMEOUT", po::value()->default_value(1000000000), "demote timeout (ms)") ("URAFT_DEAD_HANDLER_TIMEOUT", po::value()->default_value(1000000000), "metadata server dead handler timeout (ms)") ("URAFT_CHECK_CMD_PERIOD", po::value()->default_value(100), "check command status period(ms)") - ("URAFT_STATUS_PORT", po::value()->default_value(9428), "node status port") - ("URAFT_FLOATING_IP", po::value(), "uraft floating ip address"); + ("URAFT_STATUS_PORT", po::value()->default_value(9428), "node status port"); po::options_description cmdline_options; cmdline_options.add(generic).add(config).add(hidden); @@ -111,9 +110,6 @@ void parseOptions(int argc, char **argv, uRaftController::Options &opt, bool &ma opt.local_master_server = vm["LOCAL_MASTER_ADDRESS"].as(); opt.local_master_port = vm["LOCAL_MASTER_MATOCL_PORT"].as(); opt.check_cmd_status_period = vm["URAFT_CHECK_CMD_PERIOD"].as(); - if (opt.elector_mode == 0) { - opt.floating_ip = vm["URAFT_FLOATING_IP"].as(); - } make_daemon = vm["start-daemon"].as(); if (vm.count("id")) { @@ -224,11 +220,6 @@ int main(int argc, char **argv) { return EXIT_FAILURE; } - if (!opt.floating_ip.empty()) { - syslog(LOG_INFO, "Setting URAFT_FLOATING_IP to %s", opt.floating_ip.c_str()); - setenv("URAFT_FLOATING_IP", opt.floating_ip.c_str(), 0); - } - boost::asio::io_service io_service; uRaftController server(io_service); #if (BOOST_VERSION >= 104700) diff --git a/src/uraft/saunafs-uraft-helper.in b/src/uraft/saunafs-uraft-helper.in index 57585d0bf..a8b057e0a 100755 --- a/src/uraft/saunafs-uraft-helper.in +++ b/src/uraft/saunafs-uraft-helper.in @@ -155,11 +155,6 @@ saunafs_isalive() { saunafs_master isalive if [[ $? == 0 ]] ; then echo -n alive - if ! ip addr | grep -w -q "${URAFT_FLOATING_IP}"; then - log "floating ip address ${URAFT_FLOATING_IP} was lost, adding it again..." - load_config - saunafs_assign_ip - fi else echo -n dead fi diff --git a/src/uraft/uraftcontroller.h b/src/uraft/uraftcontroller.h index fa633b172..9794d05ab 100644 --- a/src/uraft/uraftcontroller.h +++ b/src/uraft/uraftcontroller.h @@ -30,7 +30,6 @@ class uRaftController : public uRaftStatus { int promote_timeout; //!< Time after which we kill promote script. // int demote_timeout; //!< Time after which we kill demote script. // int dead_handler_timeout; //!< Time after which we kill dead script. // - std::string floating_ip; //!< Floating IP addresss used by uraft. // }; public: