Flock master startup.

Flock master startup.

Since the flock fd is inherited by the master as it starts up, this protects it even before it can drop twisted.pid. This change has been tested to work on linux.

BUG=588118
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299916

[ghost stip (do not use), 2016-04-14 00:18:44]

Description was changed from

==========
Flock master startup.

BUG=588118
==========

to

==========
Flock master startup.

Since the flock fd is inherited by the master as it starts up, this protects it
even before it can drop twisted.pid. This change has been tested to work on
linux.

BUG=588118
==========

[ghost stip (do not use), 2016-04-14 00:18:44]

stip@chromium.org changed reviewers:
+ pgervais@chromium.org

[ghost stip (do not use), 2016-04-14 00:18:54]

ptal

[ghost stip (do not use), 2016-04-14 00:21:19]

https://codereview.chromium.org/1883813003/diff/20001/masters/master-common-r...
File masters/master-common-rules.mk (right):

https://codereview.chromium.org/1883813003/diff/20001/masters/master-common-r...
masters/master-common-rules.mk:77: PYTHONPATH=$(PYTHONPATH)
SCRIPTS_DIR=$(SCRIPTS_DIR) PYTHONPATH=$(PYTHONPATH)
SCRIPTS_DIR=$(SCRIPTS_DIR)$(TOPLEVEL_DIR)/masters/start_master.sh
lol

[ghost stip (do not use), 2016-04-14 00:23:11]

updated

[pgervais, 2016-04-14 00:26:01]

One question

https://codereview.chromium.org/1883813003/diff/20001/masters/master-common-r...
File masters/master-common-rules.mk (right):

https://codereview.chromium.org/1883813003/diff/20001/masters/master-common-r...
masters/master-common-rules.mk:72: ifneq ($(wildcard $(FLOCK)),)
why wildcard here? doesn't $(FLOCK) alone work?

[ghost stip (do not use), 2016-04-14 00:27:46]

https://codereview.chromium.org/1883813003/diff/20001/masters/master-common-r...
File masters/master-common-rules.mk (right):

https://codereview.chromium.org/1883813003/diff/20001/masters/master-common-r...
masters/master-common-rules.mk:72: ifneq ($(wildcard $(FLOCK)),)
On 2016/04/14 00:26:01, pgervais wrote:
> why wildcard here? doesn't $(FLOCK) alone work?

I don't believe so. 'wildcard' is apparently the file search mechanism in Make.
it's an exact path with out *s so it shouldn't match other files

[ghost stip (do not use), 2016-04-14 00:30:52]

https://codereview.chromium.org/1883813003/diff/20001/masters/master-common-r...
File masters/master-common-rules.mk (right):

https://codereview.chromium.org/1883813003/diff/20001/masters/master-common-r...
masters/master-common-rules.mk:72: ifneq ($(wildcard $(FLOCK)),)
On 2016/04/14 00:27:46, stip wrote:
> On 2016/04/14 00:26:01, pgervais wrote:
> > why wildcard here? doesn't $(FLOCK) alone work?
> 
> I don't believe so. 'wildcard' is apparently the file search mechanism in
Make.
> it's an exact path with out *s so it shouldn't match other files

I just checked, it indeed *doesn't work* when you remove the wildcard. It
returns the same result for /usr/bin/flock and /usr/bin/flocaaaaaak.

[pgervais, 2016-04-14 00:33:57]

On 2016/04/14 00:30:52, stip wrote:
>
https://codereview.chromium.org/1883813003/diff/20001/masters/master-common-r...
> File masters/master-common-rules.mk (right):
> 
>
https://codereview.chromium.org/1883813003/diff/20001/masters/master-common-r...
> masters/master-common-rules.mk:72: ifneq ($(wildcard $(FLOCK)),)
> On 2016/04/14 00:27:46, stip wrote:
> > On 2016/04/14 00:26:01, pgervais wrote:
> > > why wildcard here? doesn't $(FLOCK) alone work?
> > 
> > I don't believe so. 'wildcard' is apparently the file search mechanism in
> Make.
> > it's an exact path with out *s so it shouldn't match other files
> 
> I just checked, it indeed *doesn't work* when you remove the wildcard. It
> returns the same result for /usr/bin/flock and /usr/bin/flocaaaaaak.

lgtm

[ghost stip (do not use), 2016-04-14 00:34:48]

The CQ bit was checked by stip@chromium.org

[commit-bot: I haz the power, 2016-04-14 00:35:00]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1883813003/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1883813003/40001

[commit-bot: I haz the power, 2016-04-14 00:44:42]

Description was changed from

==========
Flock master startup.

Since the flock fd is inherited by the master as it starts up, this protects it
even before it can drop twisted.pid. This change has been tested to work on
linux.

BUG=588118
==========

to

==========
Flock master startup.

Since the flock fd is inherited by the master as it starts up, this protects it
even before it can drop twisted.pid. This change has been tested to work on
linux.

BUG=588118

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299916
==========

[commit-bot: I haz the power, 2016-04-14 00:44:43]

Committed patchset #3 (id:40001) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=299916

[dnj, 2016-04-14 15:24:52]

A revert of this CL (patchset #3 id:40001) has been created in
https://codereview.chromium.org/1890453006/ by dnj@chromium.org.

The reason for reverting is: This breaks the ability to restart internal masters
(crbug.com/603584).