> On June 24, 2017, 6:19 a.m., Jiang Yan Xu wrote: > > src/slave/slave.cpp > > Lines 6011-6020 (patched) > > <https://reviews.apache.org/r/60105/diff/8/?file=1761637#file1761637line6019> > > > > Could you use the code in my comment: > > > > ``` > > if (!state->rebooted) { > > return Failure(message); > > } > > > > LOG(WARNING) << "Falling back to recover as a new agent due to error: > > " > > << message; > > > > // Clean up the slave state to avoid any state recovery for the > > // old agent. > > slaveState = None(); > > ``` > > > > I'll comment on the specific lines for the reasoning.
Aah my bad, will get rid of the else. - Megha ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/60105/#review178830 ----------------------------------------------------------- On June 29, 2017, 11:35 p.m., Megha Sharma wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/60105/ > ----------------------------------------------------------- > > (Updated June 29, 2017, 11:35 p.m.) > > > Review request for mesos, Neil Conway, Vinod Kone, and Jiang Yan Xu. > > > Bugs: MESOS-6223 > https://issues.apache.org/jira/browse/MESOS-6223 > > > Repository: mesos > > > Description > ------- > > Prior to Mesos 1.4 we bypass the state recovery and > start as a new agent upon reboot. Starting in Mesos 1.4 > we'll attempt to recover the slave state even after reboot > except for when there is a SlaveInfo mismatch. > Here, we cleanup the slave state for a rebooted agent if > there's been a SlaveInfo mismatch during recovery to > ensure that no other state is recovered and the > agent enventually registers as a new agent. > > > Diffs > ----- > > src/slave/slave.cpp f808458849bb9667a91abe18868751d377d36e0c > > > Diff: https://reviews.apache.org/r/60105/diff/9/ > > > Testing > ------- > > make check done together with 60104 and 56895 > > > Thanks, > > Megha Sharma > >
