You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@storm.apache.org by ppoulosk <gi...@git.apache.org> on 2016/05/17 20:32:14 UTC
[GitHub] storm pull request: [STORM-1701] Port PR 1370 to 1.x-branch (Git r...
GitHub user ppoulosk opened a pull request:
https://github.com/apache/storm/pull/1427
[STORM-1701] Port PR 1370 to 1.x-branch (Git rid of hardcoded wait after worker launch)
Ported this to 1.x branch from master. @HeartSaVioR
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ppoulosk/storm PortTo1xBranch
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/storm/pull/1427.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1427
----
commit a9d51c60a4ffa27da9503a42d329906196912f2c
Author: Paul Poulosky <pp...@crawlcall.corp.ne1.yahoo.com>
Date: 2016-05-17T20:30:03Z
Port PR 1370 to 1.x-branch
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] storm pull request #1427: [STORM-1701] Port PR 1370 to 1.x-branch (Git rid o...
Posted by abellina <gi...@git.apache.org>.
Github user abellina commented on a diff in the pull request:
https://github.com/apache/storm/pull/1427#discussion_r75236698
--- Diff: storm-core/src/clj/org/apache/storm/daemon/supervisor.clj ---
@@ -415,23 +427,35 @@
;; 6. wait for workers launch
(log-debug "Syncing processes")
+ (log-debug "Keepers: " keepers)
+ (log-debug "Keep ports: " keep-ports)
+ (log-debug "Reassigned executors: " reassign-executors)
(log-debug "Assigned executors: " assigned-executors)
(log-debug "Allocated: " allocated)
(doseq [[id [state heartbeat]] allocated]
- (when (not= :valid state)
- (log-message
- "Shutting down and clearing state for id " id
- ". Current supervisor time: " now
- ". State: " state
- ", Heartbeat: " (pr-str heartbeat))
- (shutdown-worker supervisor id)))
+ (let
+ [worker-launchtime (:launchtime (@(:worker-launchtime-atom supervisor) id))]
+ (when
+ (or
+ (and (not= :valid state)
+ (not= :not-started state))
+ (and (= :not-started state)
+ (or (nil? worker-launchtime)
+ (is-worker-launchtime-timed-out? now worker-launchtime conf))))
+ (if (= :not-started state)
+ (log-message "Worker " id " failed to start"))
+ (log-message
+ "Shutting down and clearing state for id " id
+ ". Current supervisor time: " now
+ ". State: " state
+ ", Heartbeat: " (pr-str heartbeat))
+ (shutdown-worker supervisor id))))
(let [valid-new-worker-ids (get-valid-new-worker-ids conf supervisor reassign-executors new-worker-ids)]
(ls-approved-workers! local-state
(merge
(select-keys (ls-approved-workers local-state)
(keys keepers))
- valid-new-worker-ids))
- (wait-for-workers-launch conf (keys valid-new-worker-ids)))))
--- End diff --
since we removed this, we should also remove the wait-for-workers-launch private functions.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] storm pull request #1427: [STORM-1701] Port PR 1370 to 1.x-branch (Git rid o...
Posted by abellina <gi...@git.apache.org>.
Github user abellina commented on a diff in the pull request:
https://github.com/apache/storm/pull/1427#discussion_r75329259
--- Diff: storm-core/src/clj/org/apache/storm/daemon/supervisor.clj ---
@@ -415,23 +427,35 @@
;; 6. wait for workers launch
(log-debug "Syncing processes")
+ (log-debug "Keepers: " keepers)
+ (log-debug "Keep ports: " keep-ports)
+ (log-debug "Reassigned executors: " reassign-executors)
(log-debug "Assigned executors: " assigned-executors)
(log-debug "Allocated: " allocated)
(doseq [[id [state heartbeat]] allocated]
- (when (not= :valid state)
- (log-message
- "Shutting down and clearing state for id " id
- ". Current supervisor time: " now
- ". State: " state
- ", Heartbeat: " (pr-str heartbeat))
- (shutdown-worker supervisor id)))
+ (let
+ [worker-launchtime (:launchtime (@(:worker-launchtime-atom supervisor) id))]
+ (when
+ (or
+ (and (not= :valid state)
+ (not= :not-started state))
+ (and (= :not-started state)
+ (or (nil? worker-launchtime)
+ (is-worker-launchtime-timed-out? now worker-launchtime conf))))
+ (if (= :not-started state)
+ (log-message "Worker " id " failed to start"))
--- End diff --
log-error?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] storm pull request #1427: [STORM-1701] Port PR 1370 to 1.x-branch (Git rid o...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/storm/pull/1427
---
[GitHub] storm pull request: [STORM-1701] Port PR 1370 to 1.x-branch (Git r...
Posted by HeartSaVioR <gi...@git.apache.org>.
Github user HeartSaVioR commented on the pull request:
https://github.com/apache/storm/pull/1427#issuecomment-219854465
@ppoulosk I didn't take a look carefully yet but seems like builds are failing consistently. I've also seen build failure for local machine. Could you take a look?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---