----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/35571/#review88297 -----------------------------------------------------------
Adding a bit to Niq's review... src/master/detector.cpp (lines 465 - 469) <https://reviews.apache.org/r/35571/#comment140743> Let's make this a bit more consistent with other error messages. I would suggest this: ``` LOG(WARNING) << "Could not parse the JSON from ZK into a valid " << "MasterInfo protobuf '" << info << "'" << (masterInfo.isError() ? ": " + masterInfo.error() : ""); ``` - Till Toenshoff On June 17, 2015, 10:56 p.m., Marco Massenzio wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/35571/ > ----------------------------------------------------------- > > (Updated June 17, 2015, 10:56 p.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 > >
