Skip to content

GitLab

Commit c66812bb authored by Cedric Caffy's avatar Cedric Caffy
Browse files

[cta-admin] mount policy add,ch,ls

parent 2abe00fe
Hide whitespace changes
Inline Side-by-side
catalogue/Catalogue.hpp
View file @ c66812bb
......@@ -769,6 +769,7 @@ public:
virtual void modifyMountPolicyRetrievePriority(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const uint64_t retrievePriority) = 0;
virtual void modifyMountPolicyRetrieveMinRequestAge(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const uint64_t minRetrieveRequestAge) = 0;
virtual void modifyMountPolicyMaxDrivesAllowed(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const uint64_t maxDrivesAllowed) = 0;
virtual void modifyMountPolicyMaxDrivesAllowedPerVo(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const uint64_t maxDrivesAllowedPerVo) = 0;
virtual void modifyMountPolicyComment(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const std::string &comment) = 0;
virtual void createActivitiesFairShareWeight(const common::dataStructures::SecurityIdentity &admin, const std::string & diskInstanceName, const std::string & acttivity,
......
catalogue/CatalogueRetryWrapper.hpp
View file @ c66812bb
......@@ -455,6 +455,10 @@ public:
void modifyMountPolicyMaxDrivesAllowed(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const uint64_t maxDrivesAllowed) override {
return retryOnLostConnection(m_log, [&]{return m_catalogue->modifyMountPolicyMaxDrivesAllowed(admin, name, maxDrivesAllowed);}, m_maxTriesToConnect);
}
void modifyMountPolicyMaxDrivesAllowedPerVo(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const uint64_t maxDrivesAllowedPerVo) override {
return retryOnLostConnection(m_log, [&]{return m_catalogue->modifyMountPolicyMaxDrivesAllowedPerVo(admin, name, maxDrivesAllowedPerVo);}, m_maxTriesToConnect);
}
void modifyMountPolicyComment(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const std::string &comment) override {
return retryOnLostConnection(m_log, [&]{return m_catalogue->modifyMountPolicyComment(admin, name, comment);}, m_maxTriesToConnect);
......
catalogue/CatalogueTest.cpp
View file @ c66812bb
......@@ -6677,6 +6677,43 @@ TEST_P(cta_catalogue_CatalogueTest, modifyMountPolicyMaxDrivesAllowed_nonExisten
ASSERT_THROW(m_catalogue->modifyMountPolicyMaxDrivesAllowed(m_admin, name, maxDrivesAllowed), exception::UserError);
}
 
TEST_P(cta_catalogue_CatalogueTest, modifyMountPolicyMaxDrivesAllowedPerVo) {
using namespace cta;
ASSERT_TRUE(m_catalogue->getMountPolicies().empty());
auto mountPolicyToAdd = getMountPolicy1();
std::string mountPolicyName = mountPolicyToAdd.name;
m_catalogue->createMountPolicy(m_admin,mountPolicyToAdd);
const uint64_t modifiedMaxDrivesAllowedPerVo = mountPolicyToAdd.maxDrivesAllowedPerVo + 10;
m_catalogue->modifyMountPolicyMaxDrivesAllowedPerVo(m_admin, mountPolicyName, modifiedMaxDrivesAllowedPerVo);
{
const std::list<common::dataStructures::MountPolicy> mountPolicies = m_catalogue->getMountPolicies();
ASSERT_EQ(1, mountPolicies.size());
const common::dataStructures::MountPolicy mountPolicy = mountPolicies.front();
ASSERT_EQ(modifiedMaxDrivesAllowedPerVo, mountPolicy.maxDrivesAllowedPerVo);
const common::dataStructures::EntryLog modificationLog = mountPolicy.lastModificationLog;
ASSERT_EQ(m_admin.username, modificationLog.username);
ASSERT_EQ(m_admin.host, modificationLog.host);
}
}
TEST_P(cta_catalogue_CatalogueTest, modifyMountPolicyMaxDrivesAllowedPerVo_nonExistentMountPolicy) {
using namespace cta;
ASSERT_TRUE(m_catalogue->getMountPolicies().empty());
const std::string name = "mount_policy";
const uint64_t maxDrivesAllowedPerVo = 2;
ASSERT_THROW(m_catalogue->modifyMountPolicyMaxDrivesAllowedPerVo(m_admin, name, maxDrivesAllowedPerVo), exception::UserError);
}
TEST_P(cta_catalogue_CatalogueTest, modifyMountPolicyComment) {
using namespace cta;
 
......@@ -12666,7 +12703,6 @@ TEST_P(cta_catalogue_CatalogueTest, getVidToLogicalLibrary_1_tape) {
const auto itor = vidToLogicalLibrary.find(vid.str());
ASSERT_NE(vidToLogicalLibrary.end(), itor);
 
<<<<<<< HEAD
ASSERT_EQ(m_tape1.logicalLibraryName, itor->second);
}
}
......@@ -12710,24 +12746,10 @@ TEST_P(cta_catalogue_CatalogueTest, getVidToLogicalLibrary_310_tapes) {
ASSERT_NE(vidToLogicalLibrary.end(), itor);
 
ASSERT_EQ(m_tape1.logicalLibraryName, itor->second);
=======
ASSERT_EQ(vid.str(), tapeItor->second.vid);
ASSERT_EQ(m_tape1.mediaType, tapeItor->second.mediaType);
ASSERT_EQ(m_tape1.vendor, tapeItor->second.vendor);
ASSERT_EQ(m_tape1.logicalLibraryName, tapeItor->second.logicalLibraryName);
ASSERT_EQ(m_tape1.tapePoolName, tapeItor->second.tapePoolName);
ASSERT_EQ(m_vo.name, tapeItor->second.vo);
ASSERT_EQ(m_mediaType.capacityInBytes, tapeItor->second.capacityInBytes);
ASSERT_EQ(m_tape1.full, tapeItor->second.full);
ASSERT_FALSE(tapeItor->second.isFromCastor);
ASSERT_EQ(0, tapeItor->second.readMountCount);
ASSERT_EQ(0, tapeItor->second.writeMountCount);
ASSERT_EQ(m_tape1.comment, tapeItor->second.comment);
>>>>>>> [tape-lifecycle] Removed the tape readonly concept
}
}
 
TEST_P(cta_catalogue_CatalogueTest, getAllDiskSystems_no_systems) {
using namespace cta;
 
......
catalogue/DummyCatalogue.hpp
View file @ c66812bb
......@@ -117,6 +117,7 @@ public:
void modifyMountPolicyArchivePriority(const common::dataStructures::SecurityIdentity& admin, const std::string& name, const uint64_t archivePriority) override { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
void modifyMountPolicyComment(const common::dataStructures::SecurityIdentity& admin, const std::string& name, const std::string& comment) override { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
void modifyMountPolicyMaxDrivesAllowed(const common::dataStructures::SecurityIdentity& admin, const std::string& name, const uint64_t maxDrivesAllowed) override { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
void modifyMountPolicyMaxDrivesAllowedPerVo(const common::dataStructures::SecurityIdentity& admin, const std::string& name, const uint64_t maxDrivesAllowedPerVo) override { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
void modifyMountPolicyRetrieveMinRequestAge(const common::dataStructures::SecurityIdentity& admin, const std::string& name, const uint64_t minRetrieveRequestAge) override { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
void modifyMountPolicyRetrievePriority(const common::dataStructures::SecurityIdentity& admin, const std::string& name, const uint64_t retrievePriority) override { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
void modifyRequesteMountRuleComment(const common::dataStructures::SecurityIdentity& admin, const std::string& instanceName, const std::string& requesterName, const std::string& comment) override { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
......
catalogue/RdbmsCatalogue.cpp
View file @ c66812bb
......@@ -5302,6 +5302,7 @@ optional<common::dataStructures::MountPolicy> RdbmsCatalogue::getRequesterGroupM
"MOUNT_POLICY.RETRIEVE_MIN_REQUEST_AGE AS RETRIEVE_MIN_REQUEST_AGE,"
"MOUNT_POLICY.MAX_DRIVES_ALLOWED AS MAX_DRIVES_ALLOWED,"
"MOUNT_POLICY.MAX_DRIVES_ALLOWED_PER_VO AS MAX_DRIVES_ALLOWED_PER_VO,"
"MOUNT_POLICY.USER_COMMENT AS USER_COMMENT,"
......@@ -5337,6 +5338,7 @@ optional<common::dataStructures::MountPolicy> RdbmsCatalogue::getRequesterGroupM
policy.retrieveMinRequestAge = rset.columnUint64("RETRIEVE_MIN_REQUEST_AGE");
policy.maxDrivesAllowed = rset.columnUint64("MAX_DRIVES_ALLOWED");
policy.maxDrivesAllowedPerVo = rset.columnUint64("MAX_DRIVES_ALLOWED_PER_VO");
policy.comment = rset.columnString("USER_COMMENT");
policy.creationLog.username = rset.columnString("CREATION_LOG_USER_NAME");
......@@ -5531,6 +5533,7 @@ optional<common::dataStructures::MountPolicy> RdbmsCatalogue::getRequesterMountP
"MOUNT_POLICY.RETRIEVE_MIN_REQUEST_AGE AS RETRIEVE_MIN_REQUEST_AGE,"
"MOUNT_POLICY.MAX_DRIVES_ALLOWED AS MAX_DRIVES_ALLOWED,"
"MOUNT_POLICY.MAX_DRIVES_ALLOWED_PER_VO AS MAX_DRIVES_ALLOWED_PER_VO,"
"MOUNT_POLICY.USER_COMMENT AS USER_COMMENT,"
......@@ -5567,7 +5570,7 @@ optional<common::dataStructures::MountPolicy> RdbmsCatalogue::getRequesterMountP
policy.maxDrivesAllowed = rset.columnUint64("MAX_DRIVES_ALLOWED");
policy.maxDrivesAllowedPerVo = rset.columnUint64("MAX_DRIVES_ALLOWED_PER_VO");
policy.comment = rset.columnString("USER_COMMENT");
policy.creationLog.username = rset.columnString("CREATION_LOG_USER_NAME");
......@@ -5772,7 +5775,7 @@ void RdbmsCatalogue::modifyMountPolicyArchivePriority(const common::dataStructur
stmt.executeNonQuery();
if(0 == stmt.getNbAffectedRows()) {
throw exception::UserError(std::string("Cannot modify mount policy ") + name + " because they do not exist");
throw exception::UserError(std::string("Cannot modify mount policy ") + name + " because it does not exist");
}
} catch(exception::UserError &) {
throw;
......@@ -5811,7 +5814,7 @@ void RdbmsCatalogue::modifyMountPolicyArchiveMinRequestAge(const common::dataStr
stmt.executeNonQuery();
if(0 == stmt.getNbAffectedRows()) {
throw exception::UserError(std::string("Cannot modify mount policy ") + name + " because they do not exist");
throw exception::UserError(std::string("Cannot modify mount policy ") + name + " because it does not exist");
}
} catch(exception::UserError &) {
throw;
......@@ -5850,7 +5853,7 @@ void RdbmsCatalogue::modifyMountPolicyRetrievePriority(const common::dataStructu
stmt.executeNonQuery();
if(0 == stmt.getNbAffectedRows()) {
throw exception::UserError(std::string("Cannot modify mount policy ") + name + " because they do not exist");
throw exception::UserError(std::string("Cannot modify mount policy ") + name + " because it does not exist");
}
} catch(exception::UserError &) {
throw;
......@@ -5889,7 +5892,7 @@ void RdbmsCatalogue::modifyMountPolicyRetrieveMinRequestAge(const common::dataSt
stmt.executeNonQuery();
if(0 == stmt.getNbAffectedRows()) {
throw exception::UserError(std::string("Cannot modify mount policy ") + name + " because they do not exist");
throw exception::UserError(std::string("Cannot modify mount policy ") + name + " because it does not exist");
}
} catch(exception::UserError &) {
throw;
......@@ -5928,7 +5931,46 @@ void RdbmsCatalogue::modifyMountPolicyMaxDrivesAllowed(const common::dataStructu
stmt.executeNonQuery();
if(0 == stmt.getNbAffectedRows()) {
throw exception::UserError(std::string("Cannot modify mount policy ") + name + " because they do not exist");
throw exception::UserError(std::string("Cannot modify mount policy ") + name + " because it does not exist");
}
} catch(exception::UserError &) {
throw;
} catch(exception::Exception &ex) {
ex.getMessage().str(std::string(__FUNCTION__) + ": " + ex.getMessage().str());
throw;
}
m_groupMountPolicyCache.invalidate();
m_userMountPolicyCache.invalidate();
m_allMountPoliciesCache.invalidate();
}
//------------------------------------------------------------------------------
// modifyMountPolicyMaxDrivesAllowedPerVo
//------------------------------------------------------------------------------
void RdbmsCatalogue::modifyMountPolicyMaxDrivesAllowedPerVo(const common::dataStructures::SecurityIdentity &admin,
const std::string &name, const uint64_t maxDrivesAllowedPerVo) {
try {
const time_t now = time(nullptr);
const char *const sql =
"UPDATE MOUNT_POLICY SET "
"MAX_DRIVES_ALLOWED_PER_VO = :MAX_DRIVES_ALLOWED_PER_VO,"
"LAST_UPDATE_USER_NAME = :LAST_UPDATE_USER_NAME,"
"LAST_UPDATE_HOST_NAME = :LAST_UPDATE_HOST_NAME,"
"LAST_UPDATE_TIME = :LAST_UPDATE_TIME "
"WHERE "
"MOUNT_POLICY_NAME = :MOUNT_POLICY_NAME";
auto conn = m_connPool.getConn();
auto stmt = conn.createStmt(sql);
stmt.bindUint64(":MAX_DRIVES_ALLOWED_PER_VO", maxDrivesAllowedPerVo);
stmt.bindString(":LAST_UPDATE_USER_NAME", admin.username);
stmt.bindString(":LAST_UPDATE_HOST_NAME", admin.host);
stmt.bindUint64(":LAST_UPDATE_TIME", now);
stmt.bindString(":MOUNT_POLICY_NAME", name);
stmt.executeNonQuery();
if(0 == stmt.getNbAffectedRows()) {
throw exception::UserError(std::string("Cannot modify mount policy ") + name + " because it does not exist");
}
} catch(exception::UserError &) {
throw;
......@@ -5942,6 +5984,7 @@ void RdbmsCatalogue::modifyMountPolicyMaxDrivesAllowed(const common::dataStructu
m_allMountPoliciesCache.invalidate();
}
//------------------------------------------------------------------------------
// modifyMountPolicyComment
//------------------------------------------------------------------------------
......@@ -5967,7 +6010,7 @@ void RdbmsCatalogue::modifyMountPolicyComment(const common::dataStructures::Secu
stmt.executeNonQuery();
if(0 == stmt.getNbAffectedRows()) {
throw exception::UserError(std::string("Cannot modify mount policy ") + name + " because they do not exist");
throw exception::UserError(std::string("Cannot modify mount policy ") + name + " because it does not exist");
}
} catch(exception::UserError &) {
throw;
......@@ -7464,6 +7507,7 @@ RequesterAndGroupMountPolicies RdbmsCatalogue::getMountPolicies(
"MOUNT_POLICY.RETRIEVE_PRIORITY AS RETRIEVE_PRIORITY,"
"MOUNT_POLICY.RETRIEVE_MIN_REQUEST_AGE AS RETRIEVE_MIN_REQUEST_AGE,"
"MOUNT_POLICY.MAX_DRIVES_ALLOWED AS MAX_DRIVES_ALLOWED,"
"MOUNT_POLICY.MAX_DRIVES_ALLOWED_PER_VO AS MAX_DRIVES_ALLOWED_PER_VO,"
"MOUNT_POLICY.USER_COMMENT AS USER_COMMENT,"
"MOUNT_POLICY.CREATION_LOG_USER_NAME AS CREATION_LOG_USER_NAME,"
"MOUNT_POLICY.CREATION_LOG_HOST_NAME AS CREATION_LOG_HOST_NAME,"
......@@ -7491,6 +7535,7 @@ RequesterAndGroupMountPolicies RdbmsCatalogue::getMountPolicies(
"MOUNT_POLICY.RETRIEVE_PRIORITY AS RETRIEVE_PRIORITY,"
"MOUNT_POLICY.RETRIEVE_MIN_REQUEST_AGE AS RETRIEVE_MIN_REQUEST_AGE,"
"MOUNT_POLICY.MAX_DRIVES_ALLOWED AS MAX_DRIVES_ALLOWED,"
"MOUNT_POLICY.MAX_DRIVES_ALLOWED_PER_VO AS MAX_DRIVES_ALLOWED_PER_VO,"
"MOUNT_POLICY.USER_COMMENT AS USER_COMMENT,"
"MOUNT_POLICY.CREATION_LOG_USER_NAME AS CREATION_LOG_USER_NAME,"
"MOUNT_POLICY.CREATION_LOG_HOST_NAME AS CREATION_LOG_HOST_NAME,"
......@@ -7525,6 +7570,7 @@ RequesterAndGroupMountPolicies RdbmsCatalogue::getMountPolicies(
policy.retrievePriority = rset.columnUint64("RETRIEVE_PRIORITY");
policy.retrieveMinRequestAge = rset.columnUint64("RETRIEVE_MIN_REQUEST_AGE");
policy.maxDrivesAllowed = rset.columnUint64("MAX_DRIVES_ALLOWED");
policy.maxDrivesAllowedPerVo = rset.columnUint64("MAX_DRIVES_ALLOWED_PER_VO");
policy.comment = rset.columnString("USER_COMMENT");
policy.creationLog.username = rset.columnString("CREATION_LOG_USER_NAME");
policy.creationLog.host = rset.columnString("CREATION_LOG_HOST_NAME");
......
catalogue/RdbmsCatalogue.hpp
View file @ c66812bb
......@@ -729,6 +729,7 @@ public:
void modifyMountPolicyRetrievePriority(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const uint64_t retrievePriority) override;
void modifyMountPolicyRetrieveMinRequestAge(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const uint64_t minRetrieveRequestAge) override;
void modifyMountPolicyMaxDrivesAllowed(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const uint64_t maxDrivesAllowed) override;
void modifyMountPolicyMaxDrivesAllowedPerVo(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const uint64_t maxDrivesAllowedPerVo) override;
void modifyMountPolicyComment(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const std::string &comment) override;
void createActivitiesFairShareWeight(const common::dataStructures::SecurityIdentity &admin, const std::string & diskInstanceName, const std::string & activity,
......
cmdline/CtaAdminCmdParse.hpp
View file @ c66812bb
......@@ -278,6 +278,7 @@ const std::map<std::string, OptionUInt64::Key> uint64Options = {
{ "--copynb", OptionUInt64::COPY_NUMBER },
{ "--id", OptionUInt64::ARCHIVE_FILE_ID },
{ "--maxdrivesallowed", OptionUInt64::MAX_DRIVES_ALLOWED },
{ "--maxdrivesallowedpervo", OptionUInt64::MAX_DRIVES_ALLOWED_PER_VO },
{ "--maxlpos", OptionUInt64::MAX_LPOS },
{ "--minarchiverequestage", OptionUInt64::MIN_ARCHIVE_REQUEST_AGE },
{ "--minlpos", OptionUInt64::MIN_LPOS },
......@@ -437,6 +438,7 @@ const Option opt_logicallibrary { Option::OPT_STR, "--logicallibrary",
const Option opt_logicallibrary_alias { Option::OPT_STR, "--name", "-n", " <logical_library_name>", "--logicallibrary" };
const Option opt_lookupns { Option::OPT_FLAG, "--lookupnamespace", "-l", "" };
const Option opt_maxdrivesallowed { Option::OPT_UINT, "--maxdrivesallowed", "-d", " <max_drives_allowed>" };
const Option opt_maxdrivesallowedpervo { Option::OPT_UINT, "--maxdrivesallowedpervo", "-dvo", " <max_drives_allowed_per_vo>" };
const Option opt_maxlpos { Option::OPT_UINT, "--maxlpos", "-maxl", " <maximum_longitudinal_position>" };
const Option opt_mediatype { Option::OPT_STR, "--mediatype", "--mt", " <media_type_name>" };
const Option opt_mediatype_alias { Option::OPT_STR, "--name", "-n", " <media_type_name>", "--mediatype" };
......@@ -527,10 +529,10 @@ const std::map<cmd_key_t, cmd_val_t> cmdOptions = {
/*----------------------------------------------------------------------------------------------------*/
{{ AdminCmd::CMD_MOUNTPOLICY, AdminCmd::SUBCMD_ADD },
{ opt_mountpolicy_alias, opt_archivepriority, opt_minarchiverequestage, opt_retrievepriority,
opt_minretrieverequestage, opt_maxdrivesallowed, opt_comment }},
opt_minretrieverequestage, opt_maxdrivesallowed, opt_maxdrivesallowedpervo, opt_comment }},
{{ AdminCmd::CMD_MOUNTPOLICY, AdminCmd::SUBCMD_CH },
{ opt_mountpolicy_alias, opt_archivepriority.optional(), opt_minarchiverequestage.optional(),
opt_retrievepriority.optional(), opt_minretrieverequestage.optional(), opt_maxdrivesallowed.optional(),
opt_retrievepriority.optional(), opt_minretrieverequestage.optional(), opt_maxdrivesallowed.optional(), opt_maxdrivesallowedpervo.optional(),
opt_comment.optional() }},
{{ AdminCmd::CMD_MOUNTPOLICY, AdminCmd::SUBCMD_RM }, { opt_mountpolicy_alias }},
{{ AdminCmd::CMD_MOUNTPOLICY, AdminCmd::SUBCMD_LS }, { }},
......
cmdline/CtaAdminTextFormatter.cpp
View file @ c66812bb
......@@ -581,6 +581,7 @@ void TextFormatter::printMountPolicyLsHeader() {
"r.priority",
"r.minAge",
"max drives",
"max drives per vo",
"c.user",
"c.host",
"c.time",
......@@ -599,6 +600,7 @@ void TextFormatter::print(const MountPolicyLsItem &mpls_item) {
mpls_item.retrieve_priority(),
mpls_item.retrieve_min_request_age(),
mpls_item.max_drives_allowed(),
mpls_item.max_drives_allowed_per_vo(),
mpls_item.creation_log().username(),
mpls_item.creation_log().host(),
timeToStr(mpls_item.creation_log().time()),
......
continuousintegration/orchestration/tests/prepare_tests.sh
View file @ c66812bb
......@@ -182,6 +182,7 @@ kubectl --namespace ${NAMESPACE} exec ctacli -- cta-admin --json version | jq
--retrievepriority 1 \
--minretrieverequestage 1 \
--maxdrivesallowed 1 \
--maxdrivesallowedpervo 1 \
--comment "ctasystest"
kubectl --namespace ${NAMESPACE} exec ctacli -- cta-admin requestermountrule add \
--instance ${EOSINSTANCE} \
......
continuousintegration/orchestration/tests/repack_systemtest_wrapper.sh
View file @ c66812bb
......@@ -122,6 +122,9 @@ repackDisableTape() {
echo "Reclaiming tape ${VID_TO_REPACK}"
kubectl -n ${NAMESPACE} exec ctacli -- cta-admin tape reclaim --vid ${VID_TO_REPACK}
echo "Changing the state of tape ${VID_TO_REPACK} to ACTIVE"
kubectl -n ${NAMESPACE} exec ctacli -- cta-admin tape ch --vid ${VID_TO_REPACK} --state ACTIVE
echo
echo "*************************************************************"
echo "STEP $1. Launching a Repack Request on a disabled tape TEST OK"
......
xroot_plugins/XrdCtaMountPolicyLs.hpp
View file @ c66812bb
......@@ -79,6 +79,7 @@ int MountPolicyLsStream::fillBuffer(XrdSsiPb::OStreamBuffer<Data> *streambuf) {
mp_item->set_retrieve_priority(mp.retrievePriority);
mp_item->set_retrieve_min_request_age(mp.retrieveMinRequestAge);
mp_item->set_max_drives_allowed(mp.maxDrivesAllowed);
mp_item->set_max_drives_allowed_per_vo(mp.maxDrivesAllowedPerVo);
mp_item->mutable_creation_log()->set_username(mp.creationLog.username);
mp_item->mutable_creation_log()->set_host(mp.creationLog.host);
mp_item->mutable_creation_log()->set_time(mp.creationLog.time);
......
xroot_plugins/XrdSsiCtaRequestMessage.cpp
View file @ c66812bb
......@@ -1391,6 +1391,7 @@ void RequestMessage::processMountPolicy_Add(cta::xrd::Response &response)
auto &retrievepriority = getRequired(OptionUInt64::RETRIEVE_PRIORITY);
auto &minretrieverequestage = getRequired(OptionUInt64::MIN_RETRIEVE_REQUEST_AGE);
auto &maxdrivesallowed = getRequired(OptionUInt64::MAX_DRIVES_ALLOWED);
auto &maxdrivesallowedpervo = getRequired(OptionUInt64::MAX_DRIVES_ALLOWED_PER_VO);
auto &comment = getRequired(OptionString::COMMENT);
cta::catalogue::CreateMountPolicyAttributes mountPolicy;
......@@ -1400,8 +1401,7 @@ void RequestMessage::processMountPolicy_Add(cta::xrd::Response &response)
mountPolicy.retrievePriority = retrievepriority;
mountPolicy.minRetrieveRequestAge = minretrieverequestage;
mountPolicy.maxDrivesAllowed = maxdrivesallowed;
//TODO: Add the OptionUint64::MAX_DRIVES_ALLOWED_PER_VO
mountPolicy.maxDrivesAllowedPerVo = maxdrivesallowed;
mountPolicy.maxDrivesAllowedPerVo = maxdrivesallowedpervo;
mountPolicy.comment = comment;
m_catalogue.createMountPolicy(m_cliIdentity, mountPolicy);
......@@ -1421,6 +1421,7 @@ void RequestMessage::processMountPolicy_Ch(cta::xrd::Response &response)
auto retrievepriority = getOptional(OptionUInt64::RETRIEVE_PRIORITY);
auto minretrieverequestage = getOptional(OptionUInt64::MIN_RETRIEVE_REQUEST_AGE);
auto maxdrivesallowed = getOptional(OptionUInt64::MAX_DRIVES_ALLOWED);
auto maxdrivesallowedpervo = getOptional(OptionUInt64::MAX_DRIVES_ALLOWED_PER_VO);
auto comment = getOptional(OptionString::COMMENT);
if(archivepriority) {
......@@ -1438,6 +1439,9 @@ void RequestMessage::processMountPolicy_Ch(cta::xrd::Response &response)
if(maxdrivesallowed) {
m_catalogue.modifyMountPolicyMaxDrivesAllowed(m_cliIdentity, group, maxdrivesallowed.value());
}
if(maxdrivesallowedpervo){
m_catalogue.modifyMountPolicyMaxDrivesAllowedPerVo(m_cliIdentity, group, maxdrivesallowedpervo.value());
}
if(comment) {
m_catalogue.modifyMountPolicyComment(m_cliIdentity, group, comment.value());
}
......
xrootd-ssi-protobuf-interface @ 52f53bdf
Subproject commit 7aa4acf81cf4403f7caf03cf0d72d1513dd3d9e9
Subproject commit 52f53bdf8f6f08f4344c8e28cc098c471cda31af
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

imprint | privacy | Conditions of Use