Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dCache
cta
Commits
13f10d94
Commit
13f10d94
authored
Apr 15, 2019
by
Cedric CAFFY
Browse files
Corrected the setting of total stats of a Repack Request
parent
6517392e
Changes
5
Hide whitespace changes
Inline
Side-by-side
continuousintegration/orchestration/tests/repack.sh
View file @
13f10d94
...
...
@@ -32,7 +32,7 @@ echo "Preparing namespace for the tests"
kubectl
-n
${
NAMESPACE
}
cp
client_helper.sh client:/root/client_helper.sh
NB_FILES
=
5
00
NB_FILES
=
10
00
FILE_SIZE_KB
=
15
echo
...
...
continuousintegration/orchestration/tests/repack_helper.sh
View file @
13f10d94
...
...
@@ -39,7 +39,7 @@ getFirstVidContainingFiles() {
writeTapeSummary
(){
echo
"Summary of the content of the tape
$1
"
kubectl
-n
${
NAMESPACE
}
exec
ctacli
--
cta-admin ta
ls
-v
$1
-h
kubectl
-n
${
NAMESPACE
}
exec
ctacli
--
cta-admin
--json
ta
ls
-v
$1
| jq
}
executeRepack
()
{
...
...
objectstore/RepackRequest.cpp
View file @
13f10d94
...
...
@@ -237,24 +237,24 @@ uint64_t RepackRequest::getLastExpandedFSeq() {
return
m_payload
.
lastexpandedfseq
();
}
void
RepackRequest
::
add
FileToRetrieve
(
const
uint64_t
nbFilesToRetrieve
){
void
RepackRequest
::
setTotal
FileToRetrieve
(
const
uint64_t
nbFilesToRetrieve
){
checkPayloadWritable
();
m_payload
.
set_totalfilestoretrieve
(
m_payload
.
totalfilestoretrieve
()
+
nbFilesToRetrieve
);
m_payload
.
set_totalfilestoretrieve
(
nbFilesToRetrieve
);
}
void
RepackRequest
::
add
BytesToRetrieve
(
const
uint64_t
nbBytesToRetrieve
){
void
RepackRequest
::
setTotal
BytesToRetrieve
(
const
uint64_t
nbBytesToRetrieve
){
checkPayloadWritable
();
m_payload
.
set_totalbytestoretrieve
(
m_payload
.
totalbytestoretrieve
()
+
nbBytesToRetrieve
);
m_payload
.
set_totalbytestoretrieve
(
nbBytesToRetrieve
);
}
void
RepackRequest
::
add
FileToArchive
(
const
uint64_t
nbFilesToArchive
){
void
RepackRequest
::
setTotal
FileToArchive
(
const
uint64_t
nbFilesToArchive
){
checkPayloadWritable
();
m_payload
.
set_totalfilestoarchive
(
m_payload
.
totalfilestoarchive
()
+
nbFilesToArchive
);
m_payload
.
set_totalfilestoarchive
(
nbFilesToArchive
);
}
void
RepackRequest
::
add
BytesToArchive
(
const
uint64_t
nbBytesToArchive
)
{
void
RepackRequest
::
setTotal
BytesToArchive
(
const
uint64_t
nbBytesToArchive
)
{
checkPayloadWritable
();
m_payload
.
set_totalbytestoarchive
(
m_payload
.
totalbytestoarchive
()
+
nbBytesToArchive
);
m_payload
.
set_totalbytestoarchive
(
nbBytesToArchive
);
}
...
...
objectstore/RepackRequest.hpp
View file @
13f10d94
...
...
@@ -78,10 +78,10 @@ public:
void
setLastExpandedFSeq
(
uint64_t
lastExpandedFSeq
);
uint64_t
getLastExpandedFSeq
();
void
add
FileToRetrieve
(
const
uint64_t
nbFilesToRetrieve
);
void
add
BytesToRetrieve
(
const
uint64_t
nbBytesToRetrieve
);
void
add
FileToArchive
(
const
uint64_t
nbFilesToArchive
);
void
add
BytesToArchive
(
const
uint64_t
nbBytesToArchive
);
void
setTotal
FileToRetrieve
(
const
uint64_t
nbFilesToRetrieve
);
void
setTotal
BytesToRetrieve
(
const
uint64_t
nbBytesToRetrieve
);
void
setTotal
FileToArchive
(
const
uint64_t
nbFilesToArchive
);
void
setTotal
BytesToArchive
(
const
uint64_t
nbBytesToArchive
);
struct
SubrequestStatistics
{
uint64_t
fSeq
;
...
...
scheduler/OStoreDB/OStoreDB.cpp
View file @
13f10d94
...
...
@@ -2310,10 +2310,10 @@ void OStoreDB::RepackRequest::expandDone() {
void
OStoreDB
::
RepackRequest
::
setTotalStats
(
const
TotalStatsFiles
&
stats
){
ScopedExclusiveLock
rrl
(
m_repackRequest
);
m_repackRequest
.
fetch
();
m_repackRequest
.
add
FileToArchive
(
stats
.
totalFilesToArchive
);
m_repackRequest
.
add
BytesToArchive
(
stats
.
totalBytesToArchive
);
m_repackRequest
.
add
FileToRetrieve
(
stats
.
totalFilesToRetrieve
);
m_repackRequest
.
add
BytesToRetrieve
(
stats
.
totalBytesToRetrieve
);
m_repackRequest
.
setTotal
FileToArchive
(
stats
.
totalFilesToArchive
);
m_repackRequest
.
setTotal
BytesToArchive
(
stats
.
totalBytesToArchive
);
m_repackRequest
.
setTotal
FileToRetrieve
(
stats
.
totalFilesToRetrieve
);
m_repackRequest
.
setTotal
BytesToRetrieve
(
stats
.
totalBytesToRetrieve
);
m_repackRequest
.
commit
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment