From 5b94924b6e0f2ca2bb5d79ad6031422df478ce67 Mon Sep 17 00:00:00 2001
From: Eric Cano <Eric.Cano@cern.ch>
Date: Tue, 22 Nov 2016 10:58:33 +0100
Subject: [PATCH] Removed the disk pool throughput data strcutures.
The scheduling based on disk throughput estimates will not be implemented in the forseeable, if ever.
---
common/dataStructures/ArchiveRequest.cpp | 8 +----
common/dataStructures/ArchiveRequest.hpp | 2 --
common/dataStructures/RetrieveRequest.cpp | 8 +----
common/dataStructures/RetrieveRequest.hpp | 2 --
objectstore/ArchiveRequest.cpp | 38 ++---------------------
objectstore/ArchiveRequest.hpp | 6 ----
objectstore/GarbageCollectorTest.cpp | 2 --
objectstore/RetrieveRequest.cpp | 6 ----
objectstore/cta.proto | 4 ---
scheduler/OStoreDB/OStoreDB.cpp | 8 -----
scheduler/SchedulerTest.cpp | 12 -------
xroot_plugins/XrdCtaFile.cpp | 20 +++---------
12 files changed, 8 insertions(+), 108 deletions(-)
diff --git a/common/dataStructures/ArchiveRequest.cpp b/common/dataStructures/ArchiveRequest.cpp
index 32cd804e34..d6bd3f9a5b 100644
--- a/common/dataStructures/ArchiveRequest.cpp
+++ b/common/dataStructures/ArchiveRequest.cpp
@@ -27,9 +27,7 @@ namespace dataStructures {
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
-ArchiveRequest::ArchiveRequest():
- fileSize(0),
- diskpoolThroughput(0) {}
+ArchiveRequest::ArchiveRequest(): fileSize(0) {}
//------------------------------------------------------------------------------
// operator==
@@ -43,8 +41,6 @@ bool ArchiveRequest::operator==(const ArchiveRequest &rhs) const {
&& checksumValue==rhs.checksumValue
&& storageClass==rhs.storageClass
&& diskFileInfo==rhs.diskFileInfo
- && diskpoolName==rhs.diskpoolName
- && diskpoolThroughput==rhs.diskpoolThroughput
&& archiveReportURL==rhs.archiveReportURL
&& creationLog==rhs.creationLog;
}
@@ -68,8 +64,6 @@ std::ostream &operator<<(std::ostream &os, const ArchiveRequest &obj) {
<< " checksumValue=" << obj.checksumValue
<< " storageClass=" << obj.storageClass
<< " diskFileInfo=" << obj.diskFileInfo
- << " diskpoolName=" << obj.diskpoolName
- << " diskpoolThroughput=" << obj.diskpoolThroughput
<< " archiveReportURL=" << obj.archiveReportURL
<< " creationLog=" << obj.creationLog << ")";
return os;
diff --git a/common/dataStructures/ArchiveRequest.hpp b/common/dataStructures/ArchiveRequest.hpp
index 0a8a42abd4..61c0120498 100644
--- a/common/dataStructures/ArchiveRequest.hpp
+++ b/common/dataStructures/ArchiveRequest.hpp
@@ -57,8 +57,6 @@ struct ArchiveRequest {
std::string checksumValue;
std::string storageClass;
DiskFileInfo diskFileInfo;
- std::string diskpoolName;
- uint64_t diskpoolThroughput;
std::string archiveReportURL;
EntryLog creationLog;
diff --git a/common/dataStructures/RetrieveRequest.cpp b/common/dataStructures/RetrieveRequest.cpp
index 379aa6805a..e8ff6e811a 100644
--- a/common/dataStructures/RetrieveRequest.cpp
+++ b/common/dataStructures/RetrieveRequest.cpp
@@ -27,9 +27,7 @@ namespace dataStructures {
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
-RetrieveRequest::RetrieveRequest():
- archiveFileID(0),
- diskpoolThroughput(0) {}
+RetrieveRequest::RetrieveRequest(): archiveFileID(0) {}
//------------------------------------------------------------------------------
// operator==
@@ -39,8 +37,6 @@ bool RetrieveRequest::operator==(const RetrieveRequest &rhs) const {
&& archiveFileID==rhs.archiveFileID
&& dstURL==rhs.dstURL
&& diskFileInfo==rhs.diskFileInfo
- && diskpoolName==rhs.diskpoolName
- && diskpoolThroughput==rhs.diskpoolThroughput
&& entryLog==rhs.entryLog;
}
@@ -59,8 +55,6 @@ std::ostream &operator<<(std::ostream &os, const RetrieveRequest &obj) {
<< " archiveFileID=" << obj.archiveFileID
<< " dstURL=" << obj.dstURL
<< " diskFileInfo=" << obj.diskFileInfo
- << " diskpoolName=" << obj.diskpoolName
- << " diskpoolThroughput=" << obj.diskpoolThroughput
<< " creationLog=" << obj.entryLog << ")";
return os;
}
diff --git a/common/dataStructures/RetrieveRequest.hpp b/common/dataStructures/RetrieveRequest.hpp
index d8e30349a4..42d98f59a0 100644
--- a/common/dataStructures/RetrieveRequest.hpp
+++ b/common/dataStructures/RetrieveRequest.hpp
@@ -46,8 +46,6 @@ struct RetrieveRequest {
uint64_t archiveFileID;
std::string dstURL;
DiskFileInfo diskFileInfo;
- std::string diskpoolName;
- uint64_t diskpoolThroughput;
EntryLog entryLog;
}; // struct RetrieveRequest
diff --git a/objectstore/ArchiveRequest.cpp b/objectstore/ArchiveRequest.cpp
index 18a35d2284..94094e16e6 100644
--- a/objectstore/ArchiveRequest.cpp
+++ b/objectstore/ArchiveRequest.cpp
@@ -173,38 +173,6 @@ cta::common::dataStructures::ArchiveFile ArchiveRequest::getArchiveFile() {
return ret;
}
-//------------------------------------------------------------------------------
-// setDiskpoolName
-//------------------------------------------------------------------------------
-void cta::objectstore::ArchiveRequest::setDiskpoolName(const std::string &diskpoolName) {
- checkPayloadWritable();
- m_payload.set_diskpoolname(diskpoolName);
-}
-
-//------------------------------------------------------------------------------
-// getDiskpoolName
-//------------------------------------------------------------------------------
-std::string cta::objectstore::ArchiveRequest::getDiskpoolName() {
- checkPayloadReadable();
- return m_payload.diskpoolname();
-}
-
-//------------------------------------------------------------------------------
-// setDiskpoolThroughput
-//------------------------------------------------------------------------------
-void cta::objectstore::ArchiveRequest::setDiskpoolThroughput(const uint64_t diskpoolThroughput) {
- checkPayloadWritable();
- m_payload.set_diskpoolthroughput(diskpoolThroughput);
-}
-
-//------------------------------------------------------------------------------
-// getDiskpoolThroughput
-//------------------------------------------------------------------------------
-uint64_t cta::objectstore::ArchiveRequest::getDiskpoolThroughput() {
- checkPayloadReadable();
- return m_payload.diskpoolthroughput();
-}
-
//------------------------------------------------------------------------------
// setArchiveReportURL
//------------------------------------------------------------------------------
@@ -223,7 +191,7 @@ std::string ArchiveRequest::getArchiveReportURL() {
//------------------------------------------------------------------------------
-// setDiskpoolThroughput
+// setMountPolicy
//------------------------------------------------------------------------------
void cta::objectstore::ArchiveRequest::setMountPolicy(const cta::common::dataStructures::MountPolicy &mountPolicy) {
checkPayloadWritable();
@@ -231,7 +199,7 @@ void cta::objectstore::ArchiveRequest::setMountPolicy(const cta::common::dataStr
}
//------------------------------------------------------------------------------
-// setDiskpoolThroughput
+// getMountPolicy
//------------------------------------------------------------------------------
cta::common::dataStructures::MountPolicy cta::objectstore::ArchiveRequest::getMountPolicy() {
checkPayloadReadable();
@@ -451,8 +419,6 @@ std::string ArchiveRequest::dump() {
struct json_object * jo = json_object_new_object();
json_object_object_add(jo, "checksumtype", json_object_new_string(m_payload.checksumtype().c_str()));
json_object_object_add(jo, "checksumvalue", json_object_new_string(m_payload.checksumvalue().c_str()));
- json_object_object_add(jo, "diskpoolname", json_object_new_string(m_payload.diskpoolname().c_str()));
- json_object_object_add(jo, "diskpoolthroughput", json_object_new_int64(m_payload.diskpoolthroughput()));
json_object_object_add(jo, "diskfileid", json_object_new_string(m_payload.diskfileid().c_str()));
json_object_object_add(jo, "instance", json_object_new_string(m_payload.diskinstance().c_str()));
json_object_object_add(jo, "filesize", json_object_new_int64(m_payload.filesize()));
diff --git a/objectstore/ArchiveRequest.hpp b/objectstore/ArchiveRequest.hpp
index b7e9682d5d..af997ad1b0 100644
--- a/objectstore/ArchiveRequest.hpp
+++ b/objectstore/ArchiveRequest.hpp
@@ -70,12 +70,6 @@ public:
// TODO: ArchiveFile comes with extraneous information.
void setArchiveFile(const cta::common::dataStructures::ArchiveFile& archiveFile);
cta::common::dataStructures::ArchiveFile getArchiveFile();
-
- void setDiskpoolName(const std::string &diskpoolName);
- std::string getDiskpoolName();
-
- void setDiskpoolThroughput(const uint64_t diskpoolThroughput);
- uint64_t getDiskpoolThroughput();
void setArchiveReportURL(const std::string &URL);
std::string getArchiveReportURL();
diff --git a/objectstore/GarbageCollectorTest.cpp b/objectstore/GarbageCollectorTest.cpp
index 8b76c6ab47..778096057b 100644
--- a/objectstore/GarbageCollectorTest.cpp
+++ b/objectstore/GarbageCollectorTest.cpp
@@ -324,8 +324,6 @@ TEST(ObjectStore, GarbageCollectorArchiveRequest) {
ar.setOwner(agA.getAddressIfSet());
cta::common::dataStructures::MountPolicy mp;
ar.setMountPolicy(mp);
- ar.setDiskpoolName("");
- ar.setDiskpoolThroughput(666);
ar.setArchiveReportURL("");
ar.setRequester(cta::common::dataStructures::UserIdentity("user0", "group0"));
ar.setSrcURL("root://eoseos/myFile");
diff --git a/objectstore/RetrieveRequest.cpp b/objectstore/RetrieveRequest.cpp
index 5560aafa43..af7423a721 100644
--- a/objectstore/RetrieveRequest.cpp
+++ b/objectstore/RetrieveRequest.cpp
@@ -87,8 +87,6 @@ void RetrieveRequest::setSchedulerRequest(const cta::common::dataStructures::Ret
sr->set_dsturl(retrieveRequest.dstURL);
DiskFileInfoSerDeser dfisd(retrieveRequest.diskFileInfo);
dfisd.serialize(*sr->mutable_diskfileinfo());
- sr->set_diskpoolname(retrieveRequest.diskpoolName);
- sr->set_diskpoolthroughput(retrieveRequest.diskpoolThroughput);
objectstore::EntryLogSerDeser el(retrieveRequest.entryLog);
el.serialize(*sr->mutable_entrylog());
}
@@ -106,8 +104,6 @@ cta::common::dataStructures::RetrieveRequest RetrieveRequest::getSchedulerReques
objectstore::EntryLogSerDeser el(ret.entryLog);
el.deserialize(m_payload.schedulerrequest().entrylog());
ret.dstURL = m_payload.schedulerrequest().dsturl();
- ret.diskpoolName = m_payload.schedulerrequest().diskpoolname();
- ret.diskpoolThroughput = m_payload.schedulerrequest().diskpoolthroughput();
objectstore::DiskFileInfoSerDeser dfisd;
dfisd.deserialize(m_payload.schedulerrequest().diskfileinfo());
ret.diskFileInfo = dfisd;
@@ -237,8 +233,6 @@ std::string RetrieveRequest::dump() {
// json_object_object_add(jaf, "fileid", json_object_new_int64(m_payload.archivefile().size()));
// json_object_object_add(jo, "creationlog", jaf);
// json_object_object_add(jo, "dsturl", json_object_new_string(m_payload.dsturl().c_str()));
-// json_object_object_add(jo, "diskpoolname", json_object_new_string(m_payload.diskpoolname().c_str()));
-// json_object_object_add(jo, "diskpoolthroughput", json_object_new_int64(m_payload.diskpoolthroughput()));
// // Object for creation log
// json_object * jcl = json_object_new_object();
// json_object_object_add(jcl, "host", json_object_new_string(m_payload.creationlog().host().c_str()));
diff --git a/objectstore/cta.proto b/objectstore/cta.proto
index cead31cec2..8bd02b81ea 100644
--- a/objectstore/cta.proto
+++ b/objectstore/cta.proto
@@ -328,8 +328,6 @@ message ArchiveRequest {
required string checksumvalue = 9010;
required uint64 creationtime = 9015;
required uint64 reconcilationtime = 9017;
- required string diskpoolname = 9020;
- required uint64 diskpoolthroughput = 9030;
required DiskFileInfo diskfileinfo = 9040;
required string diskfileid = 9050;
required string diskinstance = 9055;
@@ -347,8 +345,6 @@ message SchedulerRetrieveRequest {
required uint64 ArchiveFileId = 9101;
required string dstURL = 9102;
required DiskFileInfo diskfileinfo = 9103;
- required string diskpoolname = 9104;
- required uint64 diskpoolthroughput = 9105;
required EntryLog entrylog = 9106;
}
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index d5629933a8..f10517f237 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -301,8 +301,6 @@ void OStoreDB::queueArchive(const std::string &instanceName, const cta::common::
aFile.storageClass = request.storageClass;
aReq.setArchiveFile(aFile);
aReq.setMountPolicy(criteria.mountPolicy);
- aReq.setDiskpoolName(request.diskpoolName);
- aReq.setDiskpoolThroughput(request.diskpoolThroughput);
aReq.setArchiveReportURL(request.archiveReportURL);
aReq.setRequester(request.requester);
aReq.setSrcURL(request.srcURL);
@@ -626,10 +624,6 @@ std::list<cta::common::dataStructures::ArchiveJob>
ret.back().request.checksumValue = osar.getArchiveFile().checksumValue;
ret.back().request.creationLog = osar.getEntryLog();
ret.back().request.diskFileID = osar.getArchiveFile().diskFileId;
- ret.back().request.diskpoolName = osar.getDiskpoolName();
- ret.back().request.diskpoolThroughput = osar.getDiskpoolThroughput();
- ret.back().request.diskFileInfo = osar.getArchiveFile().diskFileInfo;
- ret.back().request.fileSize = osar.getArchiveFile().fileSize;
ret.back().instanceName = osar.getArchiveFile().diskInstance;
ret.back().request.requester = osar.getRequester();
ret.back().request.srcURL = osar.getSrcURL();
@@ -682,8 +676,6 @@ std::map<std::string, std::list<common::dataStructures::ArchiveJob> >
ret[tpp.tapePool].back().request.checksumValue = osar.getArchiveFile().checksumValue;
ret[tpp.tapePool].back().request.creationLog = osar.getEntryLog();
ret[tpp.tapePool].back().request.diskFileID = osar.getArchiveFile().diskFileId;
- ret[tpp.tapePool].back().request.diskpoolName = osar.getDiskpoolName();
- ret[tpp.tapePool].back().request.diskpoolThroughput = osar.getDiskpoolThroughput();
ret[tpp.tapePool].back().request.diskFileInfo = osar.getArchiveFile().diskFileInfo;
ret[tpp.tapePool].back().request.fileSize = osar.getArchiveFile().fileSize;
ret[tpp.tapePool].back().instanceName = osar.getArchiveFile().diskInstance;
diff --git a/scheduler/SchedulerTest.cpp b/scheduler/SchedulerTest.cpp
index 4ba0ea5e8a..397e15defa 100644
--- a/scheduler/SchedulerTest.cpp
+++ b/scheduler/SchedulerTest.cpp
@@ -226,8 +226,6 @@ TEST_P(SchedulerTest, archive_to_new_file) {
request.checksumType="ADLER32";
request.checksumValue="1111";
request.creationLog=creationLog;
- request.diskpoolName="diskpool1";
- request.diskpoolThroughput=200*1000*1000;
request.diskFileInfo=diskFileInfo;
request.diskFileID="diskFileID";
request.fileSize=100*1000*1000;
@@ -280,8 +278,6 @@ TEST_P(SchedulerTest, delete_archive_request) {
request.checksumType="ADLER32";
request.checksumValue="1111";
request.creationLog=creationLog;
- request.diskpoolName="diskpool1";
- request.diskpoolThroughput=200*1000*1000;
request.diskFileInfo=diskFileInfo;
request.diskFileID="diskFileID";
request.fileSize=100*1000*1000;
@@ -349,8 +345,6 @@ TEST_P(SchedulerTest, archive_and_retrieve_new_file) {
request.checksumType="ADLER32";
request.checksumValue="1234abcd";
request.creationLog=creationLog;
- request.diskpoolName="diskpool1";
- request.diskpoolThroughput=200*1000*1000;
request.diskFileInfo=diskFileInfo;
request.diskFileID="diskFileID";
request.fileSize=100*1000*1000;
@@ -438,8 +432,6 @@ TEST_P(SchedulerTest, archive_and_retrieve_new_file) {
cta::common::dataStructures::RetrieveRequest request;
request.archiveFileID = archiveFileId;
request.entryLog = creationLog;
- request.diskpoolName = "diskpool1";
- request.diskpoolThroughput = 200*1000*1000;
request.diskFileInfo = diskFileInfo;
request.dstURL = "dstURL";
request.requester.name = s_userName;
@@ -508,8 +500,6 @@ TEST_P(SchedulerTest, retry_archive_until_max_reached) {
request.checksumType="ADLER32";
request.checksumValue="1111";
request.creationLog=creationLog;
- request.diskpoolName="diskpool1";
- request.diskpoolThroughput=200*1000*1000;
request.diskFileInfo=diskFileInfo;
request.diskFileID="diskFileID";
request.fileSize=100*1000*1000;
@@ -589,8 +579,6 @@ TEST_P(SchedulerTest, retrieve_non_existing_file) {
cta::common::dataStructures::RetrieveRequest request;
request.archiveFileID = 12345;
request.entryLog = creationLog;
- request.diskpoolName = "diskpool1";
- request.diskpoolThroughput = 200*1000*1000;
request.diskFileInfo = diskFileInfo;
request.dstURL = "dstURL";
request.requester.name = s_userName;
diff --git a/xroot_plugins/XrdCtaFile.cpp b/xroot_plugins/XrdCtaFile.cpp
index b0a2a297c0..d6c78271bf 100644
--- a/xroot_plugins/XrdCtaFile.cpp
+++ b/xroot_plugins/XrdCtaFile.cpp
@@ -1860,7 +1860,7 @@ void XrdCtaFile::xCom_listpendingarchives() {
if(result.size()>0) {
if(extended) {
std::vector<std::vector<std::string>> responseTable;
- std::vector<std::string> header = {"tapepool","id","storage class","copy no.","disk id","instance","checksum type","checksum value","size","user","group","path","diskpool","diskpool throughput"};
+ std::vector<std::string> header = {"tapepool","id","storage class","copy no.","disk id","instance","checksum type","checksum value","size","user","group","path"};
if(hasOption("-h", "--header")) responseTable.push_back(header);
for(auto it = result.cbegin(); it != result.cend(); it++) {
for(auto jt = it->second.cbegin(); jt != it->second.cend(); jt++) {
@@ -1877,8 +1877,6 @@ void XrdCtaFile::xCom_listpendingarchives() {
currentRow.push_back(jt->request.requester.name);
currentRow.push_back(jt->request.requester.group);
currentRow.push_back(jt->request.diskFileInfo.path);
- currentRow.push_back(jt->request.diskpoolName);
- currentRow.push_back(std::to_string((unsigned long long)jt->request.diskpoolThroughput));
responseTable.push_back(currentRow);
}
}
@@ -1927,7 +1925,7 @@ void XrdCtaFile::xCom_listpendingretrieves() {
if(result.size()>0) {
if(extended) {
std::vector<std::vector<std::string>> responseTable;
- std::vector<std::string> header = {"vid","id","copy no.","fseq","block id","size","user","group","path","diskpool","diskpool throughput"};
+ std::vector<std::string> header = {"vid","id","copy no.","fseq","block id","size","user","group","path"};
if(hasOption("-h", "--header")) responseTable.push_back(header);
for(auto it = result.cbegin(); it != result.cend(); it++) {
for(auto jt = it->second.cbegin(); jt != it->second.cend(); jt++) {
@@ -1942,8 +1940,6 @@ void XrdCtaFile::xCom_listpendingretrieves() {
currentRow.push_back(jt->request.requester.name);
currentRow.push_back(jt->request.requester.group);
currentRow.push_back(jt->request.diskFileInfo.path);
- currentRow.push_back(jt->request.diskpoolName);
- currentRow.push_back(std::to_string((unsigned long long)jt->request.diskpoolThroughput));
responseTable.push_back(currentRow);
}
}
@@ -2013,7 +2009,7 @@ void XrdCtaFile::xCom_archive() {
std::stringstream help;
help << m_requestTokens.at(0) << " a/archive --user <user> --group <group> --diskid <disk_id> --srcurl <src_URL> --size <size> --checksumtype <checksum_type>" << std::endl
<< "\t--checksumvalue <checksum_value> --storageclass <storage_class> --diskfilepath <disk_filepath> --diskfileowner <disk_fileowner>" << std::endl
- << "\t--diskfilegroup <disk_filegroup> --recoveryblob <recovery_blob> --diskpool <diskpool_name> --throughput <diskpool_throughput>" << std::endl
+ << "\t--diskfilegroup <disk_filegroup> --recoveryblob <recovery_blob>" << std::endl
<< "\tNote: apply the postfix \":base64\" to long option names whose values are base64 encoded" << std::endl;
optional<std::string> user = getOptionStringValue("", "--user", true, false);
optional<std::string> group = getOptionStringValue("", "--group", true, false);
@@ -2027,8 +2023,6 @@ void XrdCtaFile::xCom_archive() {
optional<std::string> diskfileowner = getOptionStringValue("", "--diskfileowner", true, false);
optional<std::string> diskfilegroup = getOptionStringValue("", "--diskfilegroup", true, false);
optional<std::string> recoveryblob = getOptionStringValue("", "--recoveryblob", true, false);
- optional<std::string> diskpool = getOptionStringValue("", "--diskpool", true, false);
- optional<uint64_t> throughput = getOptionUint64Value("", "--throughput", true, false);
optional<std::string> archiveReportURL = getOptionStringValue("", "-–reportURL", false, true, "");
checkOptions(help.str());
cta::common::dataStructures::UserIdentity originator;
@@ -2042,8 +2036,6 @@ void XrdCtaFile::xCom_archive() {
cta::common::dataStructures::ArchiveRequest request;
request.checksumType=checksumtype.value();
request.checksumValue=checksumvalue.value();
- request.diskpoolName=diskpool.value();
- request.diskpoolThroughput=throughput.value();
request.diskFileInfo=diskFileInfo;
request.diskFileID=diskid.value();
request.fileSize=size.value();
@@ -2063,7 +2055,7 @@ void XrdCtaFile::xCom_retrieve() {
std::stringstream cmdlineOutput;
std::stringstream help;
help << m_requestTokens.at(0) << " r/retrieve --user <user> --group <group> --id <CTA_ArchiveFileID> --dsturl <dst_URL> --diskfilepath <disk_filepath>" << std::endl
- << "\t--diskfileowner <disk_fileowner> --diskfilegroup <disk_filegroup> --recoveryblob <recovery_blob> --diskpool <diskpool_name> --throughput <diskpool_throughput>" << std::endl
+ << "\t--diskfileowner <disk_fileowner> --diskfilegroup <disk_filegroup> --recoveryblob <recovery_blob>" << std::endl
<< "\tNote: apply the postfix \":base64\" to long option names whose values are base64 encoded" << std::endl;
optional<std::string> user = getOptionStringValue("", "--user", true, false);
optional<std::string> group = getOptionStringValue("", "--group", true, false);
@@ -2073,8 +2065,6 @@ void XrdCtaFile::xCom_retrieve() {
optional<std::string> diskfileowner = getOptionStringValue("", "--diskfileowner", true, false);
optional<std::string> diskfilegroup = getOptionStringValue("", "--diskfilegroup", true, false);
optional<std::string> recoveryblob = getOptionStringValue("", "--recoveryblob", true, false);
- optional<std::string> diskpool = getOptionStringValue("", "--diskpool", true, false);
- optional<uint64_t> throughput = getOptionUint64Value("", "--throughput", true, false);
checkOptions(help.str());
cta::common::dataStructures::UserIdentity originator;
originator.name=user.value();
@@ -2085,8 +2075,6 @@ void XrdCtaFile::xCom_retrieve() {
diskFileInfo.owner=diskfileowner.value();
diskFileInfo.path=diskfilepath.value();
cta::common::dataStructures::RetrieveRequest request;
- request.diskpoolName=diskpool.value();
- request.diskpoolThroughput=throughput.value();
request.diskFileInfo=diskFileInfo;
request.archiveFileID=id.value();
request.requester=originator;
--
GitLab