Commit ce4df488 authored by Daniele Kruse's avatar Daniele Kruse
Browse files

more work

parent 5c6b10fb
......@@ -31,6 +31,7 @@ cta::common::dataStructures::ArchiveFile::ArchiveFile() {
m_fileSizeSet = false;
m_storageClassSet = false;
m_tapeCopiesSet = false;
m_creationLogSet = false;
}
//------------------------------------------------------------------------------
......@@ -46,6 +47,7 @@ bool cta::common::dataStructures::ArchiveFile::allFieldsSet() const {
return m_archiveFileIDSet
&& m_checksumTypeSet
&& m_checksumValueSet
&& m_creationLogSet
&& m_drDataSet
&& m_eosFileIDSet
&& m_fileSizeSet
......@@ -196,3 +198,21 @@ std::map<int,cta::common::dataStructures::TapeFileLocation> cta::common::dataStr
}
return m_tapeCopies;
}
//------------------------------------------------------------------------------
// setCreationLog
//------------------------------------------------------------------------------
void cta::common::dataStructures::ArchiveFile::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
m_creationLog = creationLog;
m_creationLogSet = true;
}
//------------------------------------------------------------------------------
// getCreationLog
//------------------------------------------------------------------------------
cta::common::dataStructures::EntryLog cta::common::dataStructures::ArchiveFile::getCreationLog() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
}
return m_creationLog;
}
......@@ -24,6 +24,7 @@
#include <string>
#include "common/dataStructures/DRData.hpp"
#include "common/dataStructures/EntryLog.hpp"
#include "common/dataStructures/TapeFileLocation.hpp"
namespace cta {
......@@ -67,6 +68,9 @@ public:
void setTapeCopies(const std::map<int,cta::common::dataStructures::TapeFileLocation> &tapeCopies);
std::map<int,cta::common::dataStructures::TapeFileLocation> getTapeCopies() const;
void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
cta::common::dataStructures::EntryLog getCreationLog() const;
private:
......@@ -100,6 +104,9 @@ private:
std::map<int,cta::common::dataStructures::TapeFileLocation> m_tapeCopies;
bool m_tapeCopiesSet;
cta::common::dataStructures::EntryLog m_creationLog;
bool m_creationLogSet;
}; // class ArchiveFile
} // namespace dataStructures
......
......@@ -33,6 +33,7 @@ cta::common::dataStructures::ArchiveRequest::ArchiveRequest() {
m_requesterSet = false;
m_srcURLSet = false;
m_storageClassSet = false;
m_creationLogSet = false;
}
//------------------------------------------------------------------------------
......@@ -47,6 +48,7 @@ cta::common::dataStructures::ArchiveRequest::~ArchiveRequest() throw() {
bool cta::common::dataStructures::ArchiveRequest::allFieldsSet() const {
return m_checksumTypeSet
&& m_checksumValueSet
&& m_creationLogSet
&& m_diskpoolNameSet
&& m_diskpoolThroughputSet
&& m_drDataSet
......@@ -236,3 +238,21 @@ std::string cta::common::dataStructures::ArchiveRequest::getStorageClass() const
}
return m_storageClass;
}
//------------------------------------------------------------------------------
// setCreationLog
//------------------------------------------------------------------------------
void cta::common::dataStructures::ArchiveRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
m_creationLog = creationLog;
m_creationLogSet = true;
}
//------------------------------------------------------------------------------
// getCreationLog
//------------------------------------------------------------------------------
cta::common::dataStructures::EntryLog cta::common::dataStructures::ArchiveRequest::getCreationLog() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
}
return m_creationLog;
}
......@@ -24,6 +24,7 @@
#include <string>
#include "common/dataStructures/DRData.hpp"
#include "common/dataStructures/EntryLog.hpp"
#include "common/dataStructures/Requester.hpp"
namespace cta {
......@@ -73,6 +74,9 @@ public:
void setStorageClass(const std::string &storageClass);
std::string getStorageClass() const;
void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
cta::common::dataStructures::EntryLog getCreationLog() const;
private:
......@@ -112,6 +116,9 @@ private:
std::string m_storageClass;
bool m_storageClassSet;
cta::common::dataStructures::EntryLog m_creationLog;
bool m_creationLogSet;
}; // class ArchiveRequest
} // namespace dataStructures
......
......@@ -27,6 +27,7 @@ cta::common::dataStructures::CancelRetrieveRequest::CancelRetrieveRequest() {
m_drDataSet = false;
m_dstURLSet = false;
m_requesterSet = false;
m_creationLogSet = false;
}
//------------------------------------------------------------------------------
......@@ -40,6 +41,7 @@ cta::common::dataStructures::CancelRetrieveRequest::~CancelRetrieveRequest() thr
//------------------------------------------------------------------------------
bool cta::common::dataStructures::CancelRetrieveRequest::allFieldsSet() const {
return m_archiveFileIDSet
&& m_creationLogSet
&& m_drDataSet
&& m_dstURLSet
&& m_requesterSet;
......@@ -116,3 +118,21 @@ cta::common::dataStructures::Requester cta::common::dataStructures::CancelRetrie
}
return m_requester;
}
//------------------------------------------------------------------------------
// setCreationLog
//------------------------------------------------------------------------------
void cta::common::dataStructures::CancelRetrieveRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
m_creationLog = creationLog;
m_creationLogSet = true;
}
//------------------------------------------------------------------------------
// getCreationLog
//------------------------------------------------------------------------------
cta::common::dataStructures::EntryLog cta::common::dataStructures::CancelRetrieveRequest::getCreationLog() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
}
return m_creationLog;
}
......@@ -24,6 +24,7 @@
#include <string>
#include "common/dataStructures/DRData.hpp"
#include "common/dataStructures/EntryLog.hpp"
#include "common/dataStructures/Requester.hpp"
namespace cta {
......@@ -55,6 +56,9 @@ public:
void setRequester(const cta::common::dataStructures::Requester &requester);
cta::common::dataStructures::Requester getRequester() const;
void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
cta::common::dataStructures::EntryLog getCreationLog() const;
private:
......@@ -76,6 +80,9 @@ private:
cta::common::dataStructures::Requester m_requester;
bool m_requesterSet;
cta::common::dataStructures::EntryLog m_creationLog;
bool m_creationLogSet;
}; // class CancelRetrieveRequest
} // namespace dataStructures
......
......@@ -25,6 +25,7 @@
cta::common::dataStructures::DeleteArchiveRequest::DeleteArchiveRequest() {
m_archiveFileIDSet = false;
m_requesterSet = false;
m_creationLogSet = false;
}
//------------------------------------------------------------------------------
......@@ -38,6 +39,7 @@ cta::common::dataStructures::DeleteArchiveRequest::~DeleteArchiveRequest() throw
//------------------------------------------------------------------------------
bool cta::common::dataStructures::DeleteArchiveRequest::allFieldsSet() const {
return m_archiveFileIDSet
&& m_creationLogSet
&& m_requesterSet;
}
......@@ -76,3 +78,21 @@ cta::common::dataStructures::Requester cta::common::dataStructures::DeleteArchiv
}
return m_requester;
}
//------------------------------------------------------------------------------
// setCreationLog
//------------------------------------------------------------------------------
void cta::common::dataStructures::DeleteArchiveRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
m_creationLog = creationLog;
m_creationLogSet = true;
}
//------------------------------------------------------------------------------
// getCreationLog
//------------------------------------------------------------------------------
cta::common::dataStructures::EntryLog cta::common::dataStructures::DeleteArchiveRequest::getCreationLog() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
}
return m_creationLog;
}
......@@ -23,6 +23,7 @@
#include <stdint.h>
#include <string>
#include "common/dataStructures/EntryLog.hpp"
#include "common/dataStructures/Requester.hpp"
namespace cta {
......@@ -48,6 +49,9 @@ public:
void setRequester(const cta::common::dataStructures::Requester &requester);
cta::common::dataStructures::Requester getRequester() const;
void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
cta::common::dataStructures::EntryLog getCreationLog() const;
private:
......@@ -63,6 +67,9 @@ private:
cta::common::dataStructures::Requester m_requester;
bool m_requesterSet;
cta::common::dataStructures::EntryLog m_creationLog;
bool m_creationLogSet;
}; // class DeleteArchiveRequest
} // namespace dataStructures
......
......@@ -24,6 +24,7 @@
//------------------------------------------------------------------------------
cta::common::dataStructures::ListStorageClassRequest::ListStorageClassRequest() {
m_requesterSet = false;
m_creationLogSet = false;
}
//------------------------------------------------------------------------------
......@@ -36,7 +37,8 @@ cta::common::dataStructures::ListStorageClassRequest::~ListStorageClassRequest()
// allFieldsSet
//------------------------------------------------------------------------------
bool cta::common::dataStructures::ListStorageClassRequest::allFieldsSet() const {
return m_requesterSet;
return m_requesterSet
&& m_creationLogSet;
}
//------------------------------------------------------------------------------
......@@ -56,3 +58,21 @@ cta::common::dataStructures::Requester cta::common::dataStructures::ListStorageC
}
return m_requester;
}
//------------------------------------------------------------------------------
// setCreationLog
//------------------------------------------------------------------------------
void cta::common::dataStructures::ListStorageClassRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
m_creationLog = creationLog;
m_creationLogSet = true;
}
//------------------------------------------------------------------------------
// getCreationLog
//------------------------------------------------------------------------------
cta::common::dataStructures::EntryLog cta::common::dataStructures::ListStorageClassRequest::getCreationLog() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
}
return m_creationLog;
}
......@@ -23,6 +23,7 @@
#include <stdint.h>
#include <string>
#include "common/dataStructures/EntryLog.hpp"
#include "common/dataStructures/Requester.hpp"
namespace cta {
......@@ -45,6 +46,9 @@ public:
void setRequester(const cta::common::dataStructures::Requester &requester);
cta::common::dataStructures::Requester getRequester() const;
void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
cta::common::dataStructures::EntryLog getCreationLog() const;
private:
......@@ -57,6 +61,9 @@ private:
cta::common::dataStructures::Requester m_requester;
bool m_requesterSet;
cta::common::dataStructures::EntryLog m_creationLog;
bool m_creationLogSet;
}; // class ListStorageClassRequest
} // namespace dataStructures
......
......@@ -29,6 +29,7 @@ cta::common::dataStructures::RetrieveRequest::RetrieveRequest() {
m_drDataSet = false;
m_dstURLSet = false;
m_requesterSet = false;
m_creationLogSet = false;
}
//------------------------------------------------------------------------------
......@@ -42,6 +43,7 @@ cta::common::dataStructures::RetrieveRequest::~RetrieveRequest() throw() {
//------------------------------------------------------------------------------
bool cta::common::dataStructures::RetrieveRequest::allFieldsSet() const {
return m_archiveFileIDSet
&& m_creationLogSet
&& m_diskpoolNameSet
&& m_diskpoolThroughputSet
&& m_drDataSet
......@@ -156,3 +158,21 @@ cta::common::dataStructures::Requester cta::common::dataStructures::RetrieveRequ
}
return m_requester;
}
//------------------------------------------------------------------------------
// setCreationLog
//------------------------------------------------------------------------------
void cta::common::dataStructures::RetrieveRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
m_creationLog = creationLog;
m_creationLogSet = true;
}
//------------------------------------------------------------------------------
// getCreationLog
//------------------------------------------------------------------------------
cta::common::dataStructures::EntryLog cta::common::dataStructures::RetrieveRequest::getCreationLog() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
}
return m_creationLog;
}
......@@ -24,6 +24,7 @@
#include <string>
#include "common/dataStructures/DRData.hpp"
#include "common/dataStructures/EntryLog.hpp"
#include "common/dataStructures/Requester.hpp"
namespace cta {
......@@ -61,6 +62,9 @@ public:
void setRequester(const cta::common::dataStructures::Requester &requester);
cta::common::dataStructures::Requester getRequester() const;
void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
cta::common::dataStructures::EntryLog getCreationLog() const;
private:
......@@ -88,6 +92,9 @@ private:
cta::common::dataStructures::Requester m_requester;
bool m_requesterSet;
cta::common::dataStructures::EntryLog m_creationLog;
bool m_creationLogSet;
}; // class RetrieveRequest
} // namespace dataStructures
......
......@@ -27,6 +27,7 @@ cta::common::dataStructures::UpdateFileInfoRequest::UpdateFileInfoRequest() {
m_drDataSet = false;
m_requesterSet = false;
m_storageClassSet = false;
m_creationLogSet = false;
}
//------------------------------------------------------------------------------
......@@ -40,6 +41,7 @@ cta::common::dataStructures::UpdateFileInfoRequest::~UpdateFileInfoRequest() thr
//------------------------------------------------------------------------------
bool cta::common::dataStructures::UpdateFileInfoRequest::allFieldsSet() const {
return m_archiveFileIDSet
&& m_creationLogSet
&& m_drDataSet
&& m_requesterSet
&& m_storageClassSet;
......@@ -116,3 +118,21 @@ std::string cta::common::dataStructures::UpdateFileInfoRequest::getStorageClass(
}
return m_storageClass;
}
//------------------------------------------------------------------------------
// setCreationLog
//------------------------------------------------------------------------------
void cta::common::dataStructures::UpdateFileInfoRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
m_creationLog = creationLog;
m_creationLogSet = true;
}
//------------------------------------------------------------------------------
// getCreationLog
//------------------------------------------------------------------------------
cta::common::dataStructures::EntryLog cta::common::dataStructures::UpdateFileInfoRequest::getCreationLog() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
}
return m_creationLog;
}
......@@ -24,6 +24,7 @@
#include <string>
#include "common/dataStructures/DRData.hpp"
#include "common/dataStructures/EntryLog.hpp"
#include "common/dataStructures/Requester.hpp"
namespace cta {
......@@ -55,6 +56,9 @@ public:
void setStorageClass(const std::string &storageClass);
std::string getStorageClass() const;
void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
cta::common::dataStructures::EntryLog getCreationLog() const;
private:
......@@ -76,6 +80,9 @@ private:
std::string m_storageClass;
bool m_storageClassSet;
cta::common::dataStructures::EntryLog m_creationLog;
bool m_creationLogSet;
}; // class UpdateFileInfoRequest
} // namespace dataStructures
......
......@@ -38,6 +38,7 @@ struct ArchiveRequest {
struct DRData drData;
std::string diskpoolName;
std::string diskpoolThroughput;
struct EntryLog creationLog;
}; // struct ArchiveRequest
......@@ -45,6 +46,7 @@ struct DeleteArchiveRequest {
struct Requester requester;
uint64_t archiveFileID;
struct EntryLog creationLog;
}; // struct DeleteArchiveRequest
......@@ -56,6 +58,7 @@ struct RetrieveRequest {
struct DRData drData;
std::string diskpoolName;
std::string diskpoolThroughput;
struct EntryLog creationLog;
}; // struct RetrieveRequest
......@@ -65,6 +68,7 @@ struct CancelRetrieveRequest {
uint64_t archiveFileID;
std::string dstURL;
struct DRData drData;
struct EntryLog creationLog;
}; // struct CancelRetrieveRequest
......@@ -74,6 +78,7 @@ struct UpdateFileInfoRequest {
uint64_t archiveFileID;
std::string storageClass;
struct DRData drData;
struct EntryLog creationLog;
}; // struct UpdateFileInfoRequest
......
This diff is collapsed.
//
///*
// * The CERN Tape Archive (CTA) project
// * Copyright (C) 2015 CERN
// *
// * This program is free software: you can redistribute it and/or modify
// * it under the terms of the GNU General Public License as published by
// * the Free Software Foundation, either version 3 of the License, or
// * (at your option) any later version.
// *
// * This program is distributed in the hope that it will be useful,
// * but WITHOUT ANY WARRANTY; without even the implied warranty of
// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// * GNU General Public License for more details.
// *
// * You should have received a copy of the GNU General Public License
// * along with this program. If not, see <http://www.gnu.org/licenses/>.
// */
//
//#pragma once
//
//#include "common/dataStructures/DRData.hpp"
//#include "common/dataStructures/Requester.hpp"
//#include "ObjectOps.hpp"
//#include "objectstore/cta.pb.h"
//#include "ArchiveRequestJobDump.hpp"
//#include <list>
//
//namespace cta { namespace objectstore {
//
//class Backend;
//class Agent;
//class GenericObject;
//class CreationLog;
//
//class ArchiveRequest: public ObjectOps<serializers::ArchiveRequest> {
//public:
// ArchiveRequest(const std::string & address, Backend & os);
// ArchiveRequest(Backend & os);
// ArchiveRequest(GenericObject & go);
// void initialize();
// // Job management ============================================================
// void addJob(uint16_t copyNumber, const std::string & tapepool,
// const std::string & tapepooladdress);
// void setJobFailureLimits(uint16_t copyNumber,
// uint16_t maxRetiesWithinMount, uint16_t maxTotalRetries);
// void setJobSelected(uint16_t copyNumber, const std::string & owner);
// void setJobPending(uint16_t copyNumber);
// bool setJobSuccessful(uint16_t copyNumber); //< returns true if this is the last job
// bool addJobFailure(uint16_t copyNumber, uint64_t sessionId); //< returns true the job failed
// serializers::ArchiveJobStatus getJobStatus(uint16_t copyNumber);
// // Handling of the consequences of a job status change for the entire request.
// // This function returns true if the request got finished.
// bool finishIfNecessary();
// // Mark all jobs as pending mount (following their linking to a tape pool)
// void setAllJobsLinkingToTapePool();
// // Mark all the jobs as being deleted, in case of a cancellation
// void setAllJobsFailed();
// // Mark all the jobs as pending deletion from NS.
// void setAllJobsPendingNSdeletion();
// CTA_GENERATE_EXCEPTION_CLASS(NoSuchJob);
// // Set a job ownership
// void setJobOwner(uint16_t copyNumber, const std::string & owner);
// // Request management ========================================================
// void setSuccessful();
// void setFailed();
// // ===========================================================================
// void setChecksumType(const std::string &checksumType);
// std::string getChecksumType();
//
// void setChecksumValue(const std::string &checksumValue);
// std::string getChecksumValue();
//
// void setDiskpoolName(const std::string &diskpoolName);
// std::string getDiskpoolName();
//
// void setDiskpoolThroughput(const uint64_t diskpoolThroughput);
// uint64_t getDiskpoolThroughput();
//
// void setDrData(const cta::common::dataStructures::DRData &drData);
// cta::common::dataStructures::DRData getDrData();
//
// void setEosFileID(const std::string &eosFileID);
// std::string getEosFileID();
//
// void setFileSize(const uint64_t fileSize);
// uint64_t getFileSize();
//
// void setRequester(const cta::common::dataStructures::Requester &requester);
// cta::common::dataStructures::Requester getRequester();
//
// void setSrcURL(const std::string &srcURL);
// std::string getSrcURL();
//
// void setStorageClass(const std::string &storageClass);
// std::string getStorageClass();
//
// std::list<ArchiveRequestJobDump> dumpJobs();
// void garbageCollect(const std::string &presumedOwner);
// std::string dump();
//};
//
//}}
......@@ -13,6 +13,7 @@ PROTOBUF_GENERATE_CPP(CTAProtoSources CTAProtoHeaders ${CTAProtoFiles})
set (CTAProtoDependants objectstore/Agent.hpp
objectstore/ArchiveToFileRequest.hpp
objectstore/ArchiveRequest.hpp
objectstore/CreationLog.hpp
objectstore/GenericObject.hpp
objectstore/ObjectOps.cpp
......@@ -39,6 +40,7 @@ add_library (ctaobjectstore SHARED
TapePool.cpp
Tape.cpp
ArchiveToFileRequest.cpp
ArchiveRequest.cpp
RetrieveToFileRequest.cpp
DriveRegister.cpp
BackendVFS.cpp
......
......@@ -284,8 +284,8 @@ enum ArchiveJobStatus {