----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/35571/#review88276 -----------------------------------------------------------
Looks great! I inlined a few suggestions below. Will you be following up with a test? src/master/constants.hpp (line 102) <https://reviews.apache.org/r/35571/#comment140718> Should we start with 'NOTE:"? s/0.24/Mesos 0.24/ src/master/detector.cpp (lines 450 - 473) <https://reviews.apache.org/r/35571/#comment140720> A bit dense block - can we split up and comment on the flow? src/master/detector.cpp (line 452) <https://reviews.apache.org/r/35571/#comment140719> const? src/master/detector.cpp (lines 456 - 457) <https://reviews.apache.org/r/35571/#comment140721> The wrapping seems off (taken our style guide): How about: ``` promises::fail( &promises, "Failed to parse data into valid JSON: " + jsonMasterInfo.error()); ``` src/master/detector.cpp (lines 465 - 466) <https://reviews.apache.org/r/35571/#comment140722> ``` LOG(WARNING) << "Could not parse the JSON from ZK into a valid " << "MasterInfo protobuf: " << info; ``` src/master/detector.cpp (line 468) <https://reviews.apache.org/r/35571/#comment140724> Can we inline this in the warning above, so we don't get two log lines? src/master/detector.cpp (lines 471 - 472) <https://reviews.apache.org/r/35571/#comment140723> Wrap as above :) - Niklas Nielsen On June 17, 2015, 11:18 a.m., Marco Massenzio wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/35571/ > ----------------------------------------------------------- > > (Updated June 17, 2015, 11:18 a.m.) > > > Review request for mesos, Niklas Nielsen and Vinod Kone. > > > Bugs: MESOS-2340 > https://issues.apache.org/jira/browse/MESOS-2340 > > > Repository: mesos > > > Description > ------- > > Jira: MESOS-2340 > > The Leader detector will now also try to > read nodes with label master::MASTER_INFO_JSON_LABEL > and parse the contents as JSON, converting the data > to a mesos::MasterInfo protobuf. > > The ability to support binary data in PB format is > still supported and the master::Contender will continue > to serialize the binary data, so as to be compatible with > 0.22 Mesos Masters. > > > Diffs > ----- > > src/master/constants.hpp 57cf8fbeff203847b5b5442f6c78ca9c09bcc66d > src/master/constants.cpp 8c7174a9940bd332832bf85d81ab13cf11836dd0 > src/master/detector.cpp 5700711771480f4e5da88e60657618c955f10048 > > Diff: https://reviews.apache.org/r/35571/diff/ > > > Testing > ------- > > make check > > > Thanks, > > Marco Massenzio > >
