diff --git a/objectstore/Action.hpp b/objectstore/Action.hpp index ef8e53d6139c2a2a9ef7270e7a2e8b344578481a..76f2990ced5a0b8f215c6f0d85eebfe3e65d308c 100644 --- a/objectstore/Action.hpp +++ b/objectstore/Action.hpp @@ -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; diff --git a/objectstore/FIFO.hpp b/objectstore/FIFO.hpp index 249f2c0d9b864531fe8de8aae2893e182bf8683c..a78bb77ccc00594f16e410c78a03320e7a59880a 100644 --- a/objectstore/FIFO.hpp +++ b/objectstore/FIFO.hpp @@ -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(); } diff --git a/objectstore/ObjectStoreChoice.hpp b/objectstore/ObjectStoreChoice.hpp index dd5d9b16361cc54a3067cd68d0a83d2b68008d57..49d46d6e16ad0d2a8e5cbce697e06e60b7a62ecc 100644 --- a/objectstore/ObjectStoreChoice.hpp +++ b/objectstore/ObjectStoreChoice.hpp @@ -1,7 +1,7 @@ #pragma once #include "ObjectOps.hpp" -#define USE_RADOS 0 +#define USE_RADOS 1 #if USE_RADOS typedef cta::objectstore::ObjectStoreRados myOS; #else diff --git a/objectstore/RecallJob.hpp b/objectstore/RecallJob.hpp index 18311a5a8bca313c5b03f8b1ce3941f89d68716f..e56514549564d5586335d09119dd9e58e8bae3f3 100644 --- a/objectstore/RecallJob.hpp +++ b/objectstore/RecallJob.hpp @@ -16,7 +16,7 @@ public: rjs.set_status("OK"); std::string ret = agent.nextId("RecallJob"); agent.addToIntend(container, ret, serializers::RecallJob_t); - agent.objectStore().atomicOverwrite(ret, rjs.SerializeAsString()); + agent.objectStore().create(ret, rjs.SerializeAsString()); return ret; }