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
18c05d87
Commit
18c05d87
authored
Feb 11, 2015
by
Eric Cano
Browse files
Fixed wrong creation of recall job and added missing printout of exception.
parent
54175510
Changes
4
Hide whitespace changes
Inline
Side-by-side
objectstore/Action.hpp
View file @
18c05d87
...
...
@@ -95,8 +95,9 @@ public:
std
::
cout
<<
"The recall FIFO was empty for more than a second. Exiting."
<<
std
::
endl
;
break
;
}
usleep
(
100
*
1000
);
}
catch
(
std
::
exception
&
)
{
usleep
(
10
*
1000
);
}
catch
(
std
::
exception
&
e
)
{
std
::
cout
<<
"Got exception while getting a recall job:"
<<
e
.
what
()
<<
std
::
endl
;
}
catch
(...)
{
throw
;
}
...
...
@@ -215,8 +216,6 @@ private:
for
(
std
::
list
<
AgentVisitor
::
ownershipEntry
>::
iterator
i
=
ownedObjects
.
begin
();
i
!=
ownedObjects
.
end
();
i
++
)
{
collectOwnedObject
(
*
i
);
std
::
cout
<<
"Considering owned object "
<<
i
->
name
<<
" (type:"
<<
i
->
objectType
<<
")"
<<
std
::
endl
;
}
// print the recall FIFO
std
::
cout
<<
"Recall FIFO after garbage collection:"
<<
std
::
endl
;
...
...
objectstore/FIFO.hpp
View file @
18c05d87
...
...
@@ -91,10 +91,10 @@ public:
ret
<<
"<<<< FIFO dump start"
<<
std
::
endl
<<
"Read pointer="
<<
fs
.
readpointer
()
<<
std
::
endl
<<
"Array size="
<<
fs
.
name_size
()
<<
std
::
endl
;
for
(
int
i
=
fs
.
readpointer
();
i
<
fs
.
name_size
();
i
++
)
{
ret
<<
"name[phys="
<<
i
<<
" ,log="
<<
i
-
fs
.
readpointer
()
<<
"]="
<<
fs
.
name
(
i
)
<<
std
::
endl
;
}
//
for (int i=fs.readpointer(); i<fs.name_size(); i++) {
//
ret << "name[phys=" << i << " ,log=" << i-fs.readpointer()
//
<< "]=" << fs.name(i) << std::endl;
//
}
ret
<<
">>>> FIFO dump end."
<<
std
::
endl
;
return
ret
.
str
();
}
...
...
objectstore/ObjectStoreChoice.hpp
View file @
18c05d87
#pragma once
#include
"ObjectOps.hpp"
#define USE_RADOS
0
#define USE_RADOS
1
#if USE_RADOS
typedef
cta
::
objectstore
::
ObjectStoreRados
myOS
;
#else
...
...
objectstore/RecallJob.hpp
View file @
18c05d87
...
...
@@ -16,7 +16,7 @@ public:
rjs
.
set_status
(
"OK"
);
std
::
string
ret
=
agent
.
nextId
(
"RecallJob"
);
agent
.
addToIntend
(
container
,
ret
,
serializers
::
RecallJob_t
);
agent
.
objectStore
().
atomicOverwri
te
(
ret
,
rjs
.
SerializeAsString
());
agent
.
objectStore
().
crea
te
(
ret
,
rjs
.
SerializeAsString
());
return
ret
;
}
...
...
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