{"action":"created","comment":{"url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/comments/45190627","id":45190627,"diff_hunk":"@@ -358,7 +358,39 @@ class CRegistryServer : public CSimpleInterface\n                     EXCLOG(e, \"Shutting down slave\");\n                     e->Release();\n                 }\n+                if (watchdog)\n+                    watchdog->removeSlave(ep);\n+            }\n+        }\n+\n+        CTimeMon tm(20000);\n+        unsigned numReplied = 0;\n+        while (numReplied < slavesRegistered)\n+        {\n+            unsigned remaining;\n+            if (tm.timedout(&remaining))\n+            {\n+                PROGLOG(\"Timeout waiting for Shutdown reply from slave(s) (%u replied out of %u total)\", numReplied, slavesRegistered);\n+                break;\n+            }\n+            try\n+            {\n+                rank_t sender;\n+                CMessageBuffer msg;\n+                if (queryNodeComm().recv(msg, RANK_ALL, shutdownTag, &sender, 50))\n+                    numReplied++;\n+            }\n+            catch (IMP_Exception *e)\n+            {\n+                // do not log MP link closed exceptions from ending slaves","path":"thorlcr/master/thmastermain.cpp","position":47,"original_position":47,"commit_id":"e4c0eeb7c7643a3d9ca794dd9d399dd1c2ec0567","original_commit_id":"e4c0eeb7c7643a3d9ca794dd9d399dd1c2ec0567","user":{"login":"jakesmith","id":902700,"avatar_url":"https://avatars.githubusercontent.com/u/902700?v=3","gravatar_id":"","url":"https://api.github.com/users/jakesmith","html_url":"https://github.com/jakesmith","followers_url":"https://api.github.com/users/jakesmith/followers","following_url":"https://api.github.com/users/jakesmith/following{/other_user}","gists_url":"https://api.github.com/users/jakesmith/gists{/gist_id}","starred_url":"https://api.github.com/users/jakesmith/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jakesmith/subscriptions","organizations_url":"https://api.github.com/users/jakesmith/orgs","repos_url":"https://api.github.com/users/jakesmith/repos","events_url":"https://api.github.com/users/jakesmith/events{/privacy}","received_events_url":"https://api.github.com/users/jakesmith/received_events","type":"User","site_admin":false},"body":"Am not sure what kind of IMP_Exception on recv can happen here.\r\n\r\nBit of a problem if there is from a ending slave though, as it will leave numReplied unincremented and loop will never end.","created_at":"2015-11-18T11:58:16Z","updated_at":"2015-11-18T11:58:16Z","html_url":"https://github.com/hpcc-systems/HPCC-Platform/pull/7947#discussion_r45190627","pull_request_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/7947","_links":{"self":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/comments/45190627"},"html":{"href":"https://github.com/hpcc-systems/HPCC-Platform/pull/7947#discussion_r45190627"},"pull_request":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/7947"}}},"pull_request":{"url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/7947","id":50551581,"html_url":"https://github.com/hpcc-systems/HPCC-Platform/pull/7947","diff_url":"https://github.com/hpcc-systems/HPCC-Platform/pull/7947.diff","patch_url":"https://github.com/hpcc-systems/HPCC-Platform/pull/7947.patch","issue_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues/7947","number":7947,"state":"open","locked":false,"title":"HPCC-14155 Skip slave unregister when asked to shutdown","user":{"login":"mckellyln","id":5116200,"avatar_url":"https://avatars.githubusercontent.com/u/5116200?v=3","gravatar_id":"","url":"https://api.github.com/users/mckellyln","html_url":"https://github.com/mckellyln","followers_url":"https://api.github.com/users/mckellyln/followers","following_url":"https://api.github.com/users/mckellyln/following{/other_user}","gists_url":"https://api.github.com/users/mckellyln/gists{/gist_id}","starred_url":"https://api.github.com/users/mckellyln/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mckellyln/subscriptions","organizations_url":"https://api.github.com/users/mckellyln/orgs","repos_url":"https://api.github.com/users/mckellyln/repos","events_url":"https://api.github.com/users/mckellyln/events{/privacy}","received_events_url":"https://api.github.com/users/mckellyln/received_events","type":"User","site_admin":false},"body":"Master waits for replies from all slaves before ending\r\nso init script does not send kill signal to slaves which caused them\r\nto unregister with a no longer running master.\r\n\r\n@jakesmith please review\r\n\r\nSigned-off-by: Mark Kelly <mark.kelly@lexisnexis.com>","created_at":"2015-11-12T18:54:38Z","updated_at":"2015-11-18T11:58:16Z","closed_at":null,"merged_at":null,"merge_commit_sha":"45f1419a4b332c15d8e6cb6262a1b81a2edb5b97","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/7947/commits","review_comments_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/7947/comments","review_comment_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/comments{/number}","comments_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues/7947/comments","statuses_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/statuses/e4c0eeb7c7643a3d9ca794dd9d399dd1c2ec0567","head":{"label":"mckellyln:hpcc-14155","ref":"hpcc-14155","sha":"e4c0eeb7c7643a3d9ca794dd9d399dd1c2ec0567","user":{"login":"mckellyln","id":5116200,"avatar_url":"https://avatars.githubusercontent.com/u/5116200?v=3","gravatar_id":"","url":"https://api.github.com/users/mckellyln","html_url":"https://github.com/mckellyln","followers_url":"https://api.github.com/users/mckellyln/followers","following_url":"https://api.github.com/users/mckellyln/following{/other_user}","gists_url":"https://api.github.com/users/mckellyln/gists{/gist_id}","starred_url":"https://api.github.com/users/mckellyln/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mckellyln/subscriptions","organizations_url":"https://api.github.com/users/mckellyln/orgs","repos_url":"https://api.github.com/users/mckellyln/repos","events_url":"https://api.github.com/users/mckellyln/events{/privacy}","received_events_url":"https://api.github.com/users/mckellyln/received_events","type":"User","site_admin":false},"repo":{"id":12089496,"name":"HPCC-Platform","full_name":"mckellyln/HPCC-Platform","owner":{"login":"mckellyln","id":5116200,"avatar_url":"https://avatars.githubusercontent.com/u/5116200?v=3","gravatar_id":"","url":"https://api.github.com/users/mckellyln","html_url":"https://github.com/mckellyln","followers_url":"https://api.github.com/users/mckellyln/followers","following_url":"https://api.github.com/users/mckellyln/following{/other_user}","gists_url":"https://api.github.com/users/mckellyln/gists{/gist_id}","starred_url":"https://api.github.com/users/mckellyln/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mckellyln/subscriptions","organizations_url":"https://api.github.com/users/mckellyln/orgs","repos_url":"https://api.github.com/users/mckellyln/repos","events_url":"https://api.github.com/users/mckellyln/events{/privacy}","received_events_url":"https://api.github.com/users/mckellyln/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/mckellyln/HPCC-Platform","description":"IMPORTANT - Issue tracking has been migrated to JIRA - use your github ID and password reset mechanism to log in","fork":true,"url":"https://api.github.com/repos/mckellyln/HPCC-Platform","forks_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/forks","keys_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/teams","hooks_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/hooks","issue_events_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/issues/events{/number}","events_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/events","assignees_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/assignees{/user}","branches_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/branches{/branch}","tags_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/tags","blobs_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/git/refs{/sha}","trees_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/statuses/{sha}","languages_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/languages","stargazers_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/stargazers","contributors_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/contributors","subscribers_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/subscribers","subscription_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/subscription","commits_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/commits{/sha}","git_commits_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/git/commits{/sha}","comments_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/comments{/number}","issue_comment_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/issues/comments{/number}","contents_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/contents/{+path}","compare_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/merges","archive_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/downloads","issues_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/issues{/number}","pulls_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/pulls{/number}","milestones_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/milestones{/number}","notifications_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/labels{/name}","releases_url":"https://api.github.com/repos/mckellyln/HPCC-Platform/releases{/id}","created_at":"2013-08-13T18:39:30Z","updated_at":"2015-05-06T15:40:27Z","pushed_at":"2015-11-17T16:03:05Z","git_url":"git://github.com/mckellyln/HPCC-Platform.git","ssh_url":"git@github.com:mckellyln/HPCC-Platform.git","clone_url":"https://github.com/mckellyln/HPCC-Platform.git","svn_url":"https://github.com/mckellyln/HPCC-Platform","homepage":"track.hpccsystems.com","size":156958,"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":"hpcc-systems:candidate-6.0.0","ref":"candidate-6.0.0","sha":"4ea3e47c1312a37b2c7d665ca11108828968576e","user":{"login":"hpcc-systems","id":900867,"avatar_url":"https://avatars.githubusercontent.com/u/900867?v=3","gravatar_id":"","url":"https://api.github.com/users/hpcc-systems","html_url":"https://github.com/hpcc-systems","followers_url":"https://api.github.com/users/hpcc-systems/followers","following_url":"https://api.github.com/users/hpcc-systems/following{/other_user}","gists_url":"https://api.github.com/users/hpcc-systems/gists{/gist_id}","starred_url":"https://api.github.com/users/hpcc-systems/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hpcc-systems/subscriptions","organizations_url":"https://api.github.com/users/hpcc-systems/orgs","repos_url":"https://api.github.com/users/hpcc-systems/repos","events_url":"https://api.github.com/users/hpcc-systems/events{/privacy}","received_events_url":"https://api.github.com/users/hpcc-systems/received_events","type":"Organization","site_admin":false},"repo":{"id":2030681,"name":"HPCC-Platform","full_name":"hpcc-systems/HPCC-Platform","owner":{"login":"hpcc-systems","id":900867,"avatar_url":"https://avatars.githubusercontent.com/u/900867?v=3","gravatar_id":"","url":"https://api.github.com/users/hpcc-systems","html_url":"https://github.com/hpcc-systems","followers_url":"https://api.github.com/users/hpcc-systems/followers","following_url":"https://api.github.com/users/hpcc-systems/following{/other_user}","gists_url":"https://api.github.com/users/hpcc-systems/gists{/gist_id}","starred_url":"https://api.github.com/users/hpcc-systems/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hpcc-systems/subscriptions","organizations_url":"https://api.github.com/users/hpcc-systems/orgs","repos_url":"https://api.github.com/users/hpcc-systems/repos","events_url":"https://api.github.com/users/hpcc-systems/events{/privacy}","received_events_url":"https://api.github.com/users/hpcc-systems/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/hpcc-systems/HPCC-Platform","description":"IMPORTANT - Issue tracking has been migrated to JIRA - use your github ID and password reset mechanism to log in","fork":false,"url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform","forks_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/forks","keys_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/teams","hooks_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/hooks","issue_events_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues/events{/number}","events_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/events","assignees_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/assignees{/user}","branches_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/branches{/branch}","tags_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/tags","blobs_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/git/refs{/sha}","trees_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/statuses/{sha}","languages_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/languages","stargazers_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/stargazers","contributors_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/contributors","subscribers_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/subscribers","subscription_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/subscription","commits_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/commits{/sha}","git_commits_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/git/commits{/sha}","comments_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/comments{/number}","issue_comment_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues/comments{/number}","contents_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/contents/{+path}","compare_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/merges","archive_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/downloads","issues_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues{/number}","pulls_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls{/number}","milestones_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/milestones{/number}","notifications_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/labels{/name}","releases_url":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/releases{/id}","created_at":"2011-07-11T14:29:51Z","updated_at":"2015-11-15T11:53:40Z","pushed_at":"2015-11-18T09:03:39Z","git_url":"git://github.com/hpcc-systems/HPCC-Platform.git","ssh_url":"git@github.com:hpcc-systems/HPCC-Platform.git","clone_url":"https://github.com/hpcc-systems/HPCC-Platform.git","svn_url":"https://github.com/hpcc-systems/HPCC-Platform","homepage":"track.hpccsystems.com","size":170241,"stargazers_count":261,"watchers_count":261,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":127,"mirror_url":null,"open_issues_count":440,"forks":127,"open_issues":440,"watchers":261,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/7947"},"html":{"href":"https://github.com/hpcc-systems/HPCC-Platform/pull/7947"},"issue":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues/7947"},"comments":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/issues/7947/comments"},"review_comments":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/7947/comments"},"review_comment":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/pulls/7947/commits"},"statuses":{"href":"https://api.github.com/repos/hpcc-systems/HPCC-Platform/statuses/e4c0eeb7c7643a3d9ca794dd9d399dd1c2ec0567"}}}}