X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fmon%2FFSCommands.cc;h=b7cf506fc2666eaa1340217916da4f6763564043;hb=1e59de90020f1d8d374046ef9cca56ccd4e806e2;hp=f9aee4cf35f7f2255e31dedd01ee8adff3c783a2;hpb=522d829b51d55703d604fa6a2177d1ec6ece4586;p=ceph.git diff --git a/ceph/src/mon/FSCommands.cc b/ceph/src/mon/FSCommands.cc index f9aee4cf3..b7cf506fc 100644 --- a/ceph/src/mon/FSCommands.cc +++ b/ceph/src/mon/FSCommands.cc @@ -222,19 +222,17 @@ class FsNewHandler : public FileSystemCommandHandler return -EINVAL; } + bool allow_overlay = false; + cmd_getval(cmdmap, "allow_dangerous_metadata_overlay", allow_overlay); + for (auto& fs : fsmap.get_filesystems()) { const std::vector &data_pools = fs->mds_map.get_data_pools(); - - bool sure = false; - cmd_getval(cmdmap, - "allow_dangerous_metadata_overlay", sure); - if ((std::find(data_pools.begin(), data_pools.end(), data) != data_pools.end() || fs->mds_map.get_metadata_pool() == metadata) - && !sure) { + && !allow_overlay) { ss << "Filesystem '" << fs_name << "' is already using one of the specified RADOS pools. This should ONLY be done in emergencies and after careful reading of the documentation. Pass --allow-dangerous-metadata-overlay to permit this."; - return -EEXIST; + return -EINVAL; } } @@ -255,12 +253,12 @@ class FsNewHandler : public FileSystemCommandHandler pg_pool_t const *metadata_pool = mon->osdmon()->osdmap.get_pg_pool(metadata); ceph_assert(metadata_pool != NULL); // Checked it existed above - int r = _check_pool(mon->osdmon()->osdmap, data, POOL_DATA_DEFAULT, force, &ss); + int r = _check_pool(mon->osdmon()->osdmap, data, POOL_DATA_DEFAULT, force, &ss, allow_overlay); if (r < 0) { return r; } - r = _check_pool(mon->osdmon()->osdmap, metadata, POOL_METADATA, force, &ss); + r = _check_pool(mon->osdmon()->osdmap, metadata, POOL_METADATA, force, &ss, allow_overlay); if (r < 0) { return r; } @@ -287,12 +285,19 @@ class FsNewHandler : public FileSystemCommandHandler static_cast(4.0)); mon->osdmon()->propose_pending(); + bool recover = false; + cmd_getval(cmdmap, "recover", recover); + // All checks passed, go ahead and create. auto&& fs = fsmap.create_filesystem(fs_name, metadata, data, - mon->get_quorum_con_features(), fscid); + mon->get_quorum_con_features(), fscid, recover); ss << "new fs with metadata pool " << metadata << " and data pool " << data; + if (recover) { + return 0; + } + // assign a standby to rank 0 to avoid health warnings auto info = fsmap.find_replacement_for({fs->fscid, 0}); @@ -419,6 +424,28 @@ public: fs->mds_map.set_balancer(val); }); return true; + } else if (var == "bal_rank_mask") { + if (val.empty()) { + ss << "bal_rank_mask may not be empty"; + return -EINVAL; + } + + if (fs->mds_map.check_special_bal_rank_mask(val, MDSMap::BAL_RANK_MASK_TYPE_ANY) == false) { + std::string bin_string; + int r = fs->mds_map.hex2bin(val, bin_string, MAX_MDS, ss); + if (r != 0) { + return r; + } + } + ss << "setting the metadata balancer rank mask to " << val; + + fsmap.modify_filesystem( + fs->fscid, + [val](std::shared_ptr fs) + { + fs->mds_map.set_bal_rank_mask(val); + }); + return true; } else if (var == "max_file_size") { if (interr.length()) { ss << var << " requires an integer value"; @@ -654,6 +681,38 @@ public: fs->mds_map.set_min_compat_client(vno); }; fsmap.modify_filesystem(fs->fscid, std::move(f)); + } else if (var == "refuse_client_session") { + bool refuse_session = false; + int r = parse_bool(val, &refuse_session, ss); + if (r != 0) { + return r; + } + + if (refuse_session) { + if (!(fs->mds_map.test_flag(CEPH_MDSMAP_REFUSE_CLIENT_SESSION))) { + fsmap.modify_filesystem( + fs->fscid, + [](std::shared_ptr fs) + { + fs->mds_map.set_flag(CEPH_MDSMAP_REFUSE_CLIENT_SESSION); + }); + ss << "client(s) blocked from establishing new session(s)"; + } else { + ss << "client(s) already blocked from establishing new session(s)"; + } + } else { + if (fs->mds_map.test_flag(CEPH_MDSMAP_REFUSE_CLIENT_SESSION)) { + fsmap.modify_filesystem( + fs->fscid, + [](std::shared_ptr fs) + { + fs->mds_map.clear_flag(CEPH_MDSMAP_REFUSE_CLIENT_SESSION); + }); + ss << "client(s) allowed to establish new session(s)"; + } else { + ss << "client(s) already allowed to establish new session(s)"; + } + } } else { ss << "unknown variable " << var; return -EINVAL; @@ -1081,6 +1140,100 @@ class ResetFilesystemHandler : public FileSystemCommandHandler } }; +class RenameFilesystemHandler : public FileSystemCommandHandler +{ + public: + explicit RenameFilesystemHandler(Paxos *paxos) + : FileSystemCommandHandler("fs rename"), m_paxos(paxos) + { + } + + bool batched_propose() override { + return true; + } + + int handle( + Monitor *mon, + FSMap& fsmap, + MonOpRequestRef op, + const cmdmap_t& cmdmap, + std::ostream &ss) override + { + ceph_assert(m_paxos->is_plugged()); + + string fs_name; + cmd_getval(cmdmap, "fs_name", fs_name); + auto fs = fsmap.get_filesystem(fs_name); + + string new_fs_name; + cmd_getval(cmdmap, "new_fs_name", new_fs_name); + auto new_fs = fsmap.get_filesystem(new_fs_name); + + if (fs == nullptr) { + if (new_fs) { + // make 'fs rename' idempotent + ss << "File system may already have been renamed. Desired file system '" + << new_fs_name << "' exists."; + return 0; + } else { + ss << "File system '" << fs_name << "' does not exist"; + return -ENOENT; + } + } + + if (new_fs) { + ss << "Desired file system name '" << new_fs_name << "' already in use"; + return -EINVAL; + } + + if (fs->mirror_info.mirrored) { + ss << "Mirroring is enabled on file system '"<< fs_name << "'. Disable mirroring on the " + "file system after ensuring it's OK to do so, and then retry to rename."; + return -EPERM; + } + + // Check for confirmation flag + bool sure = false; + cmd_getval(cmdmap, "yes_i_really_mean_it", sure); + if (!sure) { + ss << "this is a potentially disruptive operation, clients' cephx credentials need reauthorized " + "to access the file system and its pools with the new name. " + "Add --yes-i-really-mean-it if you are sure you wish to continue."; + return -EPERM; + } + + if (!mon->osdmon()->is_writeable()) { + // not allowed to write yet, so retry when we can + mon->osdmon()->wait_for_writeable(op, new PaxosService::C_RetryMessage(mon->mdsmon(), op)); + return -EAGAIN; + } + for (const auto p : fs->mds_map.get_data_pools()) { + mon->osdmon()->do_application_enable(p, + pg_pool_t::APPLICATION_NAME_CEPHFS, + "data", new_fs_name, true); + } + + mon->osdmon()->do_application_enable(fs->mds_map.get_metadata_pool(), + pg_pool_t::APPLICATION_NAME_CEPHFS, + "metadata", new_fs_name, true); + mon->osdmon()->propose_pending(); + + auto f = [new_fs_name](auto fs) { + fs->mds_map.set_fs_name(new_fs_name); + }; + fsmap.modify_filesystem(fs->fscid, std::move(f)); + + ss << "File system is renamed. cephx credentials authorized to " + "old file system name need to be reauthorized to new file " + "system name."; + + return 0; + } + +private: + Paxos *m_paxos; +}; + class RemoveDataPoolHandler : public FileSystemCommandHandler { public: @@ -1395,6 +1548,7 @@ FileSystemCommandHandler::load(Paxos *paxos) handlers.push_back(std::make_shared(paxos)); handlers.push_back(std::make_shared()); handlers.push_back(std::make_shared()); + handlers.push_back(std::make_shared(paxos)); handlers.push_back(std::make_shared()); handlers.push_back(std::make_shared >( @@ -1412,7 +1566,8 @@ int FileSystemCommandHandler::_check_pool( const int64_t pool_id, int type, bool force, - std::ostream *ss) const + std::ostream *ss, + bool allow_overlay) const { ceph_assert(ss != NULL); @@ -1422,7 +1577,36 @@ int FileSystemCommandHandler::_check_pool( return -ENOENT; } + if (pool->has_snaps()) { + *ss << "pool(" << pool_id <<") already has mon-managed snaps; " + "can't attach pool to fs"; + return -EOPNOTSUPP; + } + const string& pool_name = osd_map.get_pool_name(pool_id); + auto app_map = pool->application_metadata; + + if (!allow_overlay && !force && !app_map.empty()) { + auto app = app_map.find(pg_pool_t::APPLICATION_NAME_CEPHFS); + if (app != app_map.end()) { + auto& [app_name, app_metadata] = *app; + auto itr = app_metadata.find("data"); + if (itr == app_metadata.end()) { + itr = app_metadata.find("metadata"); + } + if (itr != app_metadata.end()) { + auto& [type, filesystem] = *itr; + *ss << "RADOS pool '" << pool_name << "' is already used by filesystem '" + << filesystem << "' as a '" << type << "' pool for application '" + << app_name << "'"; + return -EINVAL; + } + } else { + *ss << "RADOS pool '" << pool_name + << "' has another non-CephFS application enabled."; + return -EINVAL; + } + } if (pool->is_erasure()) { if (type == POOL_METADATA) { @@ -1493,8 +1677,9 @@ int FileSystemCommandHandler::is_op_allowed( auto fs = fsmap_copy.get_filesystem(fs_name); if (fs == nullptr) { - /* let "fs rm" handle idempotent case where file system does not exist */ - if (!(get_prefix() == "fs rm" && fsmap.get_filesystem(fs_name) == nullptr)) { + auto prefix = get_prefix(); + /* let "fs rm" and "fs rename" handle idempotent cases where file systems do not exist */ + if (!(prefix == "fs rm" || prefix == "fs rename") && fsmap.get_filesystem(fs_name) == nullptr) { ss << "Filesystem not found: '" << fs_name << "'"; return -ENOENT; }