Merge pull request #681 from nomis/fix-ostoken-generation-refresh

Fix severe peformance issue accessing keys

Author: jschlyter

src/lib/object_store/Generation.cpp

@@ -35,7 +35,7 @@
 #include "Generation.h"
 
 // Factory
-Generation* Generation::create(const std::string path, int umask, bool isToken /* = false */)
+Generation* Generation::create(const std::string path, int umask, bool isToken)
 {
 	Generation* gen = new Generation(path, umask, isToken);
 	if ((gen != NULL) && isToken && (gen->genMutex == NULL))

src/lib/object_store/Generation.h

@@ -42,7 +42,7 @@ class Generation
 {
 public:
 	// Factory
-	static Generation* create(const std::string inPath, int inUmask, bool inIsToken = false);
+	static Generation* create(const std::string inPath, int inUmask, bool inIsToken);
 
 	// Destructor
 	virtual ~Generation();

src/lib/object_store/OSToken.cpp

@@ -57,7 +57,7 @@ OSToken::OSToken(const std::string inTokenPath, int inUmask)
 	umask = inUmask;
 
 	tokenDir = new Directory(tokenPath);
-	gen = Generation::create(tokenPath + OS_PATHSEP + "generation", true);
+	gen = Generation::create(tokenPath + OS_PATHSEP + "generation", umask, true);
 	tokenObject = new ObjectFile(this, tokenPath + OS_PATHSEP + "token.object", umask, tokenPath + OS_PATHSEP + "token.lock");
 	tokenMutex = MutexFactory::i()->getMutex();
 	valid = (gen != NULL) && (tokenMutex != NULL) && tokenDir->isValid() && tokenObject->valid;

src/lib/object_store/ObjectFile.cpp

@@ -53,7 +53,7 @@ ObjectFile::ObjectFile(OSToken* parent, std::string inPath, int inUmask, std::st
 {
 	path = inPath;
 	umask = inUmask;
-	gen = Generation::create(path, umask);
+	gen = Generation::create(path, umask, false);
 	objectMutex = MutexFactory::i()->getMutex();
 	valid = (gen != NULL) && (objectMutex != NULL);
 	token = parent;