Merge branch 'devel' of https://github.com/graetzer/arangodb into devel

arangod/Pregel/Recovery.h

@@ -64,7 +64,9 @@ class RecoveryManager {
   void updatedFailedServers();
   // bool allServersAvailable(std::vector<ServerID> const& dbServers);
 };
+  
 /*
+template
 class CheckpointingManager {
   friend class RestPregelHandler;
 
@@ -75,9 +77,11 @@ class CheckpointingManager {
 
  public:
   template <typename V, typename E>
-  void replicateGraphData(GraphStore<V, E> const* graphStore) {}
+  void replicateGraphData(uint64_t exn, uint64_t gss, 
+ GraphStore<V, E> const* graphStore);
   
-  void restoreGraphData(GraphStore<V, E> const*)
+  void restoreGraphData(uint64_t exn, uint64_t gss, 
+    GraphStore<V, E> const* graphStore);
 
   void reloadPlanData() { _secondaries.clear(); }
 };*/

arangod/Pregel/Utils.cpp

@@ -48,7 +48,8 @@ std::string const Utils::startRecoveryPath = "startRecovery";
 std::string const Utils::continueRecoveryPath = "continueRecovery";
 std::string const Utils::finishedRecoveryPath = "finishedRecovery";
 std::string const Utils::finalizeRecoveryPath = "finalizeRecovery";
-std::string const Utils::aqlResultsPath = "collectAQL";
+std::string const Utils::storeCheckpointPath = "storeCheckpoint";
+std::string const Utils::aqlResultsPath = "aqlResult";
 
 std::string const Utils::executionNumberKey = "exn";
 std::string const Utils::algorithmKey = "algorithm";
@@ -102,7 +103,7 @@ std::shared_ptr<LogicalCollection> Utils::resolveCollection(
   if (it != collectionPlanIdMap.end()) {
     return ci->getCollection(database, it->second);
   }
-  LOG_TOPIC(INFO, Logger::PREGEL) << "The collection could not be translated to a planID";
+  LOG_TOPIC(ERR, Logger::PREGEL) << "The collection could not be translated to a planID";
   // THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL,
   //                               "The collection could not be translated to a
   //                               planID");

arangod/Pregel/Utils.h

@@ -53,7 +53,7 @@ class Utils {
   static std::string const continueRecoveryPath;
   static std::string const finishedRecoveryPath;
   static std::string const finalizeRecoveryPath;
-  //static std::string const storeCheckpointDataPath;
+  static std::string const storeCheckpointPath;
   static std::string const aqlResultsPath;
 
   static std::string const executionNumberKey;
@@ -68,18 +68,47 @@ class Utils {
   static std::string const lazyLoadingKey;
   static std::string const parallelismKey;
 
+  /// Current global superstep
   static std::string const globalSuperstepKey;
+  
+  /// Communicate number of loaded vertices to conductor
   static std::string const vertexCountKey;
+  
+  /// Communicate number of loaded edges to conductor
   static std::string const edgeCountKey;
+  
+  /// Shard id, part of message header
   static std::string const shardIdKey;
+  
+  /// holds messages
   static std::string const messagesKey;
+  
+  /// sender cluster id
   static std::string const senderKey;
+  
+  /// Recovery method name
   static std::string const recoveryMethodKey;
+  
+  /// Tells workers to store the result into the collections
+  /// otherwise dicard results
   static std::string const storeResultsKey;
+  
+  /// Holds aggregated values
   static std::string const aggregatorValuesKey;
+  
+  /// Communicates the # of active vertices to the conductor
   static std::string const activeCountKey;
+  
+  /// Used to track number of messages received during the last
+  /// superstep, by the worker (bookkeeping)
   static std::string const receivedCountKey;
+  
+  /// Used to track number of messages send during the last
+  /// superstep (bookkeeping)
   static std::string const sendCountKey;
+  
+  /// Used to communicate to enter the next phase
+  /// only send by the conductor
   static std::string const enterNextGSSKey;
 
   static std::string const compensate;