From b360419f5f0beda0236cc590e261fb9fd7bff8e1 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 17 Sep 2024 10:24:12 -0400 Subject: [PATCH] mon: remove duplicated NVMeofGwMap.h commit 8d402e31f5eaadfefe0afe909f5ad3bc5a907e18 added a duplicate copy of ceph/src/mon/NVMeofGwMap.h at ceph/NVMeofGwMap.h Signed-off-by: Casey Bodley --- NVMeofGwMap.h | 118 -------------------------------------------------- 1 file changed, 118 deletions(-) delete mode 100755 NVMeofGwMap.h diff --git a/NVMeofGwMap.h b/NVMeofGwMap.h deleted file mode 100755 index f7955e5b531..00000000000 --- a/NVMeofGwMap.h +++ /dev/null @@ -1,118 +0,0 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -// vim: ts=8 sw=2 smarttab -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2023 IBM, Inc. - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - */ - -#ifndef MON_NVMEOFGWMAP_H_ -#define MON_NVMEOFGWMAP_H_ -#include -#include -#include "include/encoding.h" -#include "include/utime.h" -#include "common/Formatter.h" -#include "common/ceph_releases.h" -#include "common/version.h" -#include "common/options.h" -#include "common/Clock.h" -#include "msg/Message.h" -#include "common/ceph_time.h" -#include "NVMeofGwTypes.h" -#define dout_context g_ceph_context -#define dout_subsys ceph_subsys_mon -#undef dout_prefix -#define MODULE_PREFFIX "nvmeofgw " -#define dout_prefix *_dout << MODULE_PREFFIX << __PRETTY_FUNCTION__ << " " - - -static const version_t STRUCT_VERSION = 2; -static const version_t OLD_STRUCT_VERSION = 1; - -using ceph::coarse_mono_clock; -class Monitor; -/*-------------------*/ -class NVMeofGwMap -{ -public: - Monitor* mon = NULL; - epoch_t epoch = 0; // epoch is for Paxos synchronization mechanizm - bool delay_propose = false; - std::map peer_addr_2_version; - std::map created_gws; - std::map fsm_timers;// map that handles timers started by all Gateway FSMs - void to_gmap(std::map& Gmap) const; - - int cfg_add_gw (const NvmeGwId &gw_id, const NvmeGroupKey& group_key); - int cfg_delete_gw (const NvmeGwId &gw_id, const NvmeGroupKey& group_key); - void process_gw_map_ka (const NvmeGwId &gw_id, const NvmeGroupKey& group_key, epoch_t& last_osd_epoch, bool &propose_pending); - int process_gw_map_gw_down (const NvmeGwId &gw_id, const NvmeGroupKey& group_key, bool &propose_pending); - void update_active_timers (bool &propose_pending); - void handle_abandoned_ana_groups (bool &propose_pending); - void handle_removed_subsystems (const NvmeGwId &gw_id, const NvmeGroupKey& group_key, const std::vector ¤t_subsystems, bool &propose_pending); - void start_timer (const NvmeGwId &gw_id, const NvmeGroupKey& group_key, NvmeAnaGrpId anagrpid, uint8_t value); -private: - void add_grp_id (const NvmeGwId &gw_id, const NvmeGroupKey& group_key, const NvmeAnaGrpId grpid); - void remove_grp_id(const NvmeGwId &gw_id, const NvmeGroupKey& group_key, const NvmeAnaGrpId grpid); - void fsm_handle_gw_down (const NvmeGwId &gw_id, const NvmeGroupKey& group_key, gw_states_per_group_t state, NvmeAnaGrpId grpid, bool &map_modified); - void fsm_handle_gw_delete (const NvmeGwId &gw_id, const NvmeGroupKey& group_key, gw_states_per_group_t state, NvmeAnaGrpId grpid, bool &map_modified); - void fsm_handle_gw_alive (const NvmeGwId &gw_id, const NvmeGroupKey& group_key, NvmeGwMonState & gw_state, gw_states_per_group_t state, - NvmeAnaGrpId grpid, epoch_t& last_osd_epoch, bool &map_modified); - void fsm_handle_to_expired (const NvmeGwId &gw_id, const NvmeGroupKey& group_key, NvmeAnaGrpId grpid, bool &map_modified); - - void find_failover_candidate(const NvmeGwId &gw_id, const NvmeGroupKey& group_key, NvmeAnaGrpId grpid, bool &propose_pending); - void find_failback_gw (const NvmeGwId &gw_id, const NvmeGroupKey& group_key, bool &propose_pending); - void set_failover_gw_for_ANA_group (const NvmeGwId &failed_gw_id, const NvmeGroupKey& group_key, const NvmeGwId &gw_id, - NvmeAnaGrpId groupid); - - - int get_timer (const NvmeGwId &gw_id, const NvmeGroupKey& group_key, NvmeAnaGrpId anagrpid); - void cancel_timer(const NvmeGwId &gw_id, const NvmeGroupKey& group_key, NvmeAnaGrpId anagrpid); - void validate_gw_map(const NvmeGroupKey& group_key); - -public: - int blocklist_gw(const NvmeGwId &gw_id, const NvmeGroupKey& group_key, NvmeAnaGrpId ANA_groupid, epoch_t &epoch, bool failover); - - void encode(ceph::buffer::list &bl, uint64_t features) const { - uint8_t version; - if (HAVE_FEATURE(features, SERVER_SQUID)) version = STRUCT_VERSION; - else version = OLD_STRUCT_VERSION; - ENCODE_START(version, 1, bl); - dout(4) << "encode1 version " << (uint64_t)version << version << " features " << features << dendl; - using ceph::encode; - encode(epoch, bl);// global map epoch - if (version == STRUCT_VERSION) { - //encode(peer_addr_2_version, bl); - } - encode(created_gws, bl, features); //Encode created GWs - encode(fsm_timers, bl, features); - ENCODE_FINISH(bl); - } - - void decode(ceph::buffer::list::const_iterator &bl) { - using ceph::decode; - epoch_t struct_version = 0; - DECODE_START(STRUCT_VERSION, bl); - DECODE_OLDEST(1); - struct_version = struct_v; - dout(4) << "decode version " << struct_version << dendl; - decode(epoch, bl); - if (struct_version == STRUCT_VERSION) { - //dout(4) << "Decode peer_2_addr " << dendl; - //decode(peer_addr_2_version, bl); - } - decode(created_gws, bl); - decode(fsm_timers, bl); - DECODE_FINISH(bl); - } -}; - -#include "NVMeofGwSerialize.h" - -#endif /* SRC_MON_NVMEOFGWMAP_H_ */ -- 2.39.5