{"action":"created","comment":{"url":"https://api.github.com/repos/highfidelity/hifi/pulls/comments/22911703","id":22911703,"diff_hunk":"@@ -142,82 +215,180 @@ void OctreePersistThread::persist() {\n \n         backup(); // handle backup if requested        \n \n-        qDebug() << \"saving Octree to file \" << _filename << \"...\";\n-        _tree->writeToSVOFile(qPrintable(_filename));\n-        time(&_lastPersistTime);\n-        _tree->clearDirtyBit(); // tree is clean after saving\n-        qDebug() << \"DONE saving Octree to file...\";\n+\n+        // create our \"lock\" file to indicate we're saving.\n+        QString lockFileName = _filename + \".lock\";\n+        std::ofstream lockFile(qPrintable(lockFileName), std::ios::out|std::ios::binary);\n+        if(lockFile.is_open()) {\n+            qDebug() << \"saving Octree lock file created at:\" << lockFileName;\n+\n+            qDebug() << \"saving Octree to file \" << _filename << \"...\";\n+            \n+            _tree->writeToSVOFile(qPrintable(_filename));\n+            time(&_lastPersistTime);\n+            _tree->clearDirtyBit(); // tree is clean after saving\n+            qDebug() << \"DONE saving Octree to file...\";\n+\n+            lockFile.close();\n+            qDebug() << \"saving Octree lock file closed:\" << lockFileName;\n+            remove(qPrintable(lockFileName));\n+            qDebug() << \"saving Octree lock file removed:\" << lockFileName;\n+        }\n     }","path":"libraries/octree/src/OctreePersistThread.cpp","position":169,"original_position":169,"commit_id":"6eb35bf98cfbefc3b5c4a23caa3eba66c266c646","original_commit_id":"6eb35bf98cfbefc3b5c4a23caa3eba66c266c646","user":{"login":"AndrewMeadows","id":2186405,"avatar_url":"https://avatars.githubusercontent.com/u/2186405?v=3","gravatar_id":"","url":"https://api.github.com/users/AndrewMeadows","html_url":"https://github.com/AndrewMeadows","followers_url":"https://api.github.com/users/AndrewMeadows/followers","following_url":"https://api.github.com/users/AndrewMeadows/following{/other_user}","gists_url":"https://api.github.com/users/AndrewMeadows/gists{/gist_id}","starred_url":"https://api.github.com/users/AndrewMeadows/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AndrewMeadows/subscriptions","organizations_url":"https://api.github.com/users/AndrewMeadows/orgs","repos_url":"https://api.github.com/users/AndrewMeadows/repos","events_url":"https://api.github.com/users/AndrewMeadows/events{/privacy}","received_events_url":"https://api.github.com/users/AndrewMeadows/received_events","type":"User","site_admin":false},"body":"Unfortunately, on linux it is possible for multiple processes to open and write to the same file, so this lock won't work.  There is an \"advisory lock\" system available on linux (flock) but it is rather OS-specific.  It looks like Qt supplies OS-agnostic file locking tools for us:\r\n\r\nhttp://doc.qt.io/qt-5/qlockfile.html\r\n\r\nAs the Qt documentation points out:\r\n\r\n    Serialization is only guaranteed if all processes that access the shared resource use QLockFile, with the same file path.\r\n\r\nThis means they are probably using \"advisory locks\" under the linux hood.","created_at":"2015-01-14T01:46:10Z","updated_at":"2015-01-14T01:46:10Z","html_url":"https://github.com/highfidelity/hifi/pull/4100#discussion_r22911703","pull_request_url":"https://api.github.com/repos/highfidelity/hifi/pulls/4100","_links":{"self":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/comments/22911703"},"html":{"href":"https://github.com/highfidelity/hifi/pull/4100#discussion_r22911703"},"pull_request":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/4100"}}},"pull_request":{"url":"https://api.github.com/repos/highfidelity/hifi/pulls/4100","id":27307625,"html_url":"https://github.com/highfidelity/hifi/pull/4100","diff_url":"https://github.com/highfidelity/hifi/pull/4100.diff","patch_url":"https://github.com/highfidelity/hifi/pull/4100.patch","issue_url":"https://api.github.com/repos/highfidelity/hifi/issues/4100","number":4100,"state":"open","locked":false,"title":"Add support for multiple backup rules","user":{"login":"ZappoMan","id":2093195,"avatar_url":"https://avatars.githubusercontent.com/u/2093195?v=3","gravatar_id":"","url":"https://api.github.com/users/ZappoMan","html_url":"https://github.com/ZappoMan","followers_url":"https://api.github.com/users/ZappoMan/followers","following_url":"https://api.github.com/users/ZappoMan/following{/other_user}","gists_url":"https://api.github.com/users/ZappoMan/gists{/gist_id}","starred_url":"https://api.github.com/users/ZappoMan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ZappoMan/subscriptions","organizations_url":"https://api.github.com/users/ZappoMan/orgs","repos_url":"https://api.github.com/users/ZappoMan/repos","events_url":"https://api.github.com/users/ZappoMan/events{/privacy}","received_events_url":"https://api.github.com/users/ZappoMan/received_events","type":"User","site_admin":false},"body":"* Added support for multiple different interval backup rules\r\n* Added default backup rules settings for: 5 half hourly backups, 7 daily backups, 4 weekly backups, and 12 thirty-day backups\r\n* Added support for detecting crash on save, in case of crash on save, we will restore the most recent backup upon next start of server.","created_at":"2015-01-13T21:45:47Z","updated_at":"2015-01-14T01:46:10Z","closed_at":null,"merged_at":null,"merge_commit_sha":"f09992e819be577e4f7bb5840837233373750d43","assignee":{"login":"AndrewMeadows","id":2186405,"avatar_url":"https://avatars.githubusercontent.com/u/2186405?v=3","gravatar_id":"","url":"https://api.github.com/users/AndrewMeadows","html_url":"https://github.com/AndrewMeadows","followers_url":"https://api.github.com/users/AndrewMeadows/followers","following_url":"https://api.github.com/users/AndrewMeadows/following{/other_user}","gists_url":"https://api.github.com/users/AndrewMeadows/gists{/gist_id}","starred_url":"https://api.github.com/users/AndrewMeadows/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AndrewMeadows/subscriptions","organizations_url":"https://api.github.com/users/AndrewMeadows/orgs","repos_url":"https://api.github.com/users/AndrewMeadows/repos","events_url":"https://api.github.com/users/AndrewMeadows/events{/privacy}","received_events_url":"https://api.github.com/users/AndrewMeadows/received_events","type":"User","site_admin":false},"milestone":null,"commits_url":"https://api.github.com/repos/highfidelity/hifi/pulls/4100/commits","review_comments_url":"https://api.github.com/repos/highfidelity/hifi/pulls/4100/comments","review_comment_url":"https://api.github.com/repos/highfidelity/hifi/pulls/comments/{number}","comments_url":"https://api.github.com/repos/highfidelity/hifi/issues/4100/comments","statuses_url":"https://api.github.com/repos/highfidelity/hifi/statuses/6eb35bf98cfbefc3b5c4a23caa3eba66c266c646","head":{"label":"ZappoMan:backupBugFix","ref":"backupBugFix","sha":"6eb35bf98cfbefc3b5c4a23caa3eba66c266c646","user":{"login":"ZappoMan","id":2093195,"avatar_url":"https://avatars.githubusercontent.com/u/2093195?v=3","gravatar_id":"","url":"https://api.github.com/users/ZappoMan","html_url":"https://github.com/ZappoMan","followers_url":"https://api.github.com/users/ZappoMan/followers","following_url":"https://api.github.com/users/ZappoMan/following{/other_user}","gists_url":"https://api.github.com/users/ZappoMan/gists{/gist_id}","starred_url":"https://api.github.com/users/ZappoMan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ZappoMan/subscriptions","organizations_url":"https://api.github.com/users/ZappoMan/orgs","repos_url":"https://api.github.com/users/ZappoMan/repos","events_url":"https://api.github.com/users/ZappoMan/events{/privacy}","received_events_url":"https://api.github.com/users/ZappoMan/received_events","type":"User","site_admin":false},"repo":{"id":9376434,"name":"hifi","full_name":"ZappoMan/hifi","owner":{"login":"ZappoMan","id":2093195,"avatar_url":"https://avatars.githubusercontent.com/u/2093195?v=3","gravatar_id":"","url":"https://api.github.com/users/ZappoMan","html_url":"https://github.com/ZappoMan","followers_url":"https://api.github.com/users/ZappoMan/followers","following_url":"https://api.github.com/users/ZappoMan/following{/other_user}","gists_url":"https://api.github.com/users/ZappoMan/gists{/gist_id}","starred_url":"https://api.github.com/users/ZappoMan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ZappoMan/subscriptions","organizations_url":"https://api.github.com/users/ZappoMan/orgs","repos_url":"https://api.github.com/users/ZappoMan/repos","events_url":"https://api.github.com/users/ZappoMan/events{/privacy}","received_events_url":"https://api.github.com/users/ZappoMan/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/ZappoMan/hifi","description":"Test platform for various render and interface tests for next-gen VR system","fork":true,"url":"https://api.github.com/repos/ZappoMan/hifi","forks_url":"https://api.github.com/repos/ZappoMan/hifi/forks","keys_url":"https://api.github.com/repos/ZappoMan/hifi/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ZappoMan/hifi/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ZappoMan/hifi/teams","hooks_url":"https://api.github.com/repos/ZappoMan/hifi/hooks","issue_events_url":"https://api.github.com/repos/ZappoMan/hifi/issues/events{/number}","events_url":"https://api.github.com/repos/ZappoMan/hifi/events","assignees_url":"https://api.github.com/repos/ZappoMan/hifi/assignees{/user}","branches_url":"https://api.github.com/repos/ZappoMan/hifi/branches{/branch}","tags_url":"https://api.github.com/repos/ZappoMan/hifi/tags","blobs_url":"https://api.github.com/repos/ZappoMan/hifi/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ZappoMan/hifi/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ZappoMan/hifi/git/refs{/sha}","trees_url":"https://api.github.com/repos/ZappoMan/hifi/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ZappoMan/hifi/statuses/{sha}","languages_url":"https://api.github.com/repos/ZappoMan/hifi/languages","stargazers_url":"https://api.github.com/repos/ZappoMan/hifi/stargazers","contributors_url":"https://api.github.com/repos/ZappoMan/hifi/contributors","subscribers_url":"https://api.github.com/repos/ZappoMan/hifi/subscribers","subscription_url":"https://api.github.com/repos/ZappoMan/hifi/subscription","commits_url":"https://api.github.com/repos/ZappoMan/hifi/commits{/sha}","git_commits_url":"https://api.github.com/repos/ZappoMan/hifi/git/commits{/sha}","comments_url":"https://api.github.com/repos/ZappoMan/hifi/comments{/number}","issue_comment_url":"https://api.github.com/repos/ZappoMan/hifi/issues/comments/{number}","contents_url":"https://api.github.com/repos/ZappoMan/hifi/contents/{+path}","compare_url":"https://api.github.com/repos/ZappoMan/hifi/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ZappoMan/hifi/merges","archive_url":"https://api.github.com/repos/ZappoMan/hifi/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ZappoMan/hifi/downloads","issues_url":"https://api.github.com/repos/ZappoMan/hifi/issues{/number}","pulls_url":"https://api.github.com/repos/ZappoMan/hifi/pulls{/number}","milestones_url":"https://api.github.com/repos/ZappoMan/hifi/milestones{/number}","notifications_url":"https://api.github.com/repos/ZappoMan/hifi/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ZappoMan/hifi/labels{/name}","releases_url":"https://api.github.com/repos/ZappoMan/hifi/releases{/id}","created_at":"2013-04-11T17:41:25Z","updated_at":"2015-01-14T00:13:51Z","pushed_at":"2015-01-14T00:14:38Z","git_url":"git://github.com/ZappoMan/hifi.git","ssh_url":"git@github.com:ZappoMan/hifi.git","clone_url":"https://github.com/ZappoMan/hifi.git","svn_url":"https://github.com/ZappoMan/hifi","homepage":null,"size":133673,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"highfidelity:master","ref":"master","sha":"89dceefd2f8ab7c49759288db658ed6c8ca4aeb9","user":{"login":"highfidelity","id":1565370,"avatar_url":"https://avatars.githubusercontent.com/u/1565370?v=3","gravatar_id":"","url":"https://api.github.com/users/highfidelity","html_url":"https://github.com/highfidelity","followers_url":"https://api.github.com/users/highfidelity/followers","following_url":"https://api.github.com/users/highfidelity/following{/other_user}","gists_url":"https://api.github.com/users/highfidelity/gists{/gist_id}","starred_url":"https://api.github.com/users/highfidelity/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/highfidelity/subscriptions","organizations_url":"https://api.github.com/users/highfidelity/orgs","repos_url":"https://api.github.com/users/highfidelity/repos","events_url":"https://api.github.com/users/highfidelity/events{/privacy}","received_events_url":"https://api.github.com/users/highfidelity/received_events","type":"Organization","site_admin":false},"repo":{"id":5372872,"name":"hifi","full_name":"highfidelity/hifi","owner":{"login":"highfidelity","id":1565370,"avatar_url":"https://avatars.githubusercontent.com/u/1565370?v=3","gravatar_id":"","url":"https://api.github.com/users/highfidelity","html_url":"https://github.com/highfidelity","followers_url":"https://api.github.com/users/highfidelity/followers","following_url":"https://api.github.com/users/highfidelity/following{/other_user}","gists_url":"https://api.github.com/users/highfidelity/gists{/gist_id}","starred_url":"https://api.github.com/users/highfidelity/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/highfidelity/subscriptions","organizations_url":"https://api.github.com/users/highfidelity/orgs","repos_url":"https://api.github.com/users/highfidelity/repos","events_url":"https://api.github.com/users/highfidelity/events{/privacy}","received_events_url":"https://api.github.com/users/highfidelity/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/highfidelity/hifi","description":"Open, decentralized virtual worlds using sensors to control avatars and dynamically assigned devices as servers.  San Francisco based startup, we are hiring: http://highfidelity.io/jobs  Documentation at http://docs.highfidelity.io  Contribute by reporting bugs & doing jobs on http://worklist.net","fork":false,"url":"https://api.github.com/repos/highfidelity/hifi","forks_url":"https://api.github.com/repos/highfidelity/hifi/forks","keys_url":"https://api.github.com/repos/highfidelity/hifi/keys{/key_id}","collaborators_url":"https://api.github.com/repos/highfidelity/hifi/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/highfidelity/hifi/teams","hooks_url":"https://api.github.com/repos/highfidelity/hifi/hooks","issue_events_url":"https://api.github.com/repos/highfidelity/hifi/issues/events{/number}","events_url":"https://api.github.com/repos/highfidelity/hifi/events","assignees_url":"https://api.github.com/repos/highfidelity/hifi/assignees{/user}","branches_url":"https://api.github.com/repos/highfidelity/hifi/branches{/branch}","tags_url":"https://api.github.com/repos/highfidelity/hifi/tags","blobs_url":"https://api.github.com/repos/highfidelity/hifi/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/highfidelity/hifi/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/highfidelity/hifi/git/refs{/sha}","trees_url":"https://api.github.com/repos/highfidelity/hifi/git/trees{/sha}","statuses_url":"https://api.github.com/repos/highfidelity/hifi/statuses/{sha}","languages_url":"https://api.github.com/repos/highfidelity/hifi/languages","stargazers_url":"https://api.github.com/repos/highfidelity/hifi/stargazers","contributors_url":"https://api.github.com/repos/highfidelity/hifi/contributors","subscribers_url":"https://api.github.com/repos/highfidelity/hifi/subscribers","subscription_url":"https://api.github.com/repos/highfidelity/hifi/subscription","commits_url":"https://api.github.com/repos/highfidelity/hifi/commits{/sha}","git_commits_url":"https://api.github.com/repos/highfidelity/hifi/git/commits{/sha}","comments_url":"https://api.github.com/repos/highfidelity/hifi/comments{/number}","issue_comment_url":"https://api.github.com/repos/highfidelity/hifi/issues/comments/{number}","contents_url":"https://api.github.com/repos/highfidelity/hifi/contents/{+path}","compare_url":"https://api.github.com/repos/highfidelity/hifi/compare/{base}...{head}","merges_url":"https://api.github.com/repos/highfidelity/hifi/merges","archive_url":"https://api.github.com/repos/highfidelity/hifi/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/highfidelity/hifi/downloads","issues_url":"https://api.github.com/repos/highfidelity/hifi/issues{/number}","pulls_url":"https://api.github.com/repos/highfidelity/hifi/pulls{/number}","milestones_url":"https://api.github.com/repos/highfidelity/hifi/milestones{/number}","notifications_url":"https://api.github.com/repos/highfidelity/hifi/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/highfidelity/hifi/labels{/name}","releases_url":"https://api.github.com/repos/highfidelity/hifi/releases{/id}","created_at":"2012-08-10T18:26:22Z","updated_at":"2015-01-14T01:12:06Z","pushed_at":"2015-01-14T01:12:06Z","git_url":"git://github.com/highfidelity/hifi.git","ssh_url":"git@github.com:highfidelity/hifi.git","clone_url":"https://github.com/highfidelity/hifi.git","svn_url":"https://github.com/highfidelity/hifi","homepage":"","size":173507,"stargazers_count":219,"watchers_count":219,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":128,"mirror_url":null,"open_issues_count":47,"forks":128,"open_issues":47,"watchers":219,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/4100"},"html":{"href":"https://github.com/highfidelity/hifi/pull/4100"},"issue":{"href":"https://api.github.com/repos/highfidelity/hifi/issues/4100"},"comments":{"href":"https://api.github.com/repos/highfidelity/hifi/issues/4100/comments"},"review_comments":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/4100/comments"},"review_comment":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/4100/commits"},"statuses":{"href":"https://api.github.com/repos/highfidelity/hifi/statuses/6eb35bf98cfbefc3b5c4a23caa3eba66c266c646"}}}}