----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/58408/#review172169 -----------------------------------------------------------
Fix it, then Ship it! src/slave/containerizer/mesos/provisioner/backends/copy.cpp Lines 200 (patched) <https://reviews.apache.org/r/58408/#comment245282> I would add extra parathesis for the second half: ``` if (os::exists(rootfsPath) && (os::stat::isdir(rootfsPath) != ftsIsDir)) { ... } ``` This improves readability because the reader might not understand the operator priority. - Jie Yu On April 17, 2017, 9:44 p.m., Chun-Hung Hsiao wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/58408/ > ----------------------------------------------------------- > > (Updated April 17, 2017, 9:44 p.m.) > > > Review request for mesos, Gilbert Song, Jie Yu, and Vinod Kone. > > > Bugs: MESOS-5028 > https://issues.apache.org/jira/browse/MESOS-5028 > > > Repository: mesos > > > Description > ------- > > When a layer overwrites a directory with a regular file or symbolic link > (or vice versa), the old dir/file need to be removed before copying the > layer into the rootfs. This is processed together with whiteout: > The copy provisioner find all files to remove, including files > marked as whiteout and the files described above, and remove them > before the copy process. > > > Diffs > ----- > > src/slave/containerizer/mesos/provisioner/backends/copy.cpp > 584cc6524f81cc1bc231b105507dbfe51fec991d > > > Diff: https://reviews.apache.org/r/58408/diff/4/ > > > Testing > ------- > > make check > Manually tested on the following images: > https://hub.docker.com/r/gilbertsong/whiteout/ > https://hub.docker.com/r/chhsiao/overwrite/ > > > Thanks, > > Chun-Hung Hsiao > >
