bot_update incorrectly deleting directory containing deleted DEPS entry |
|||||
Issue descriptionOn my CL [1], some trybots work [2] and some don't. [3] The problem is not in my CL, it's with the bots. In the bot_update step on [2], the bot did not blow away pdfium/testing/gtest, whereas [3] does. [2] is running in /b/build, and [3] is running in /mnt/data/b/build. Meanwhile, Windows bots don't have this problem. I highly suspect gclient.py is not calculating the path correctly due to symlinks. :-\ I will have a proposed CL to fix this shortly. [1] https://pdfium-review.googlesource.com/c/pdfium/+/28791 [2] https://build.chromium.org/p/tryserver.client.pdfium/builders/linux_xfa/builds/8905 [3] https://build.chromium.org/p/tryserver.client.pdfium/builders/linux_asan_lsan/builds/6351
,
Mar 20 2018
I should mention, I can't actually repro this locally, so my CL is just speculation. Without more debugging data on the failing bots, it's hard to tell. Maybe there's an extra '/' somewhere, or there's a '/' vs '\' issue? Let me whip up a CL to add in more debugging data first. I looked at [2] and [3] again. [2] started without testing/gtest in its .gclient_entries file. That may be a better explanation of why it succeeded, but [3] didn't. So my initial guess is likely wrong.
,
Mar 20 2018
pwnall's googletest update CL for V8 [4] hit this too. [4] https://chromium-review.googlesource.com/c/v8/v8/+/639953
,
Mar 20 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/depot_tools/+/33bf49538c3c6cbffd50dc379c811f81fdf7383d commit 33bf49538c3c6cbffd50dc379c811f81fdf7383d Author: Lei Zhang <thestig@chromium.org> Date: Tue Mar 20 19:01:25 2018 Add debugging info when gclient deletes an old DEPS entry. To help figure out why it decided to do so. BUG= 823586 Change-Id: I93d7c9f7af6145ee0ebd9f5ad4483f27925e84d6 Reviewed-on: https://chromium-review.googlesource.com/970082 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Aaron Gable <agable@chromium.org> [modify] https://crrev.com/33bf49538c3c6cbffd50dc379c811f81fdf7383d/gclient.py [modify] https://crrev.com/33bf49538c3c6cbffd50dc379c811f81fdf7383d/tests/gclient_smoketest.py
,
Mar 20 2018
I think we are waiting for the Recipe Roller to update the relevant copy of depot_tools with the above changes. However, there was a non-trivial roll [5] from a few days ago, and the Recipe Roller may be waiting for human interaction before continuing. I nudged folks on that CL. [5] https://chromium-review.googlesource.com/965610
,
Mar 21 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/a22f1657cd9c991d47fbfa5b72689c93b0311a81 commit a22f1657cd9c991d47fbfa5b72689c93b0311a81 Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Date: Wed Mar 21 02:36:11 2018 Roll src/third_party/depot_tools/ 0b89935ad..6f64a0522 (4 commits) https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/0b89935ad6fe..6f64a0522bb8 $ git log 0b89935ad..6f64a0522 --date=short --no-merges --format='%ad %ae %s' 2018-03-20 ehmaldonado Reland "gclient: Add commands to edit dependencies and variables in DEPS" 2018-03-20 jbudorick [gclient] Use a single CIPD root for an entire gclient checkout. 2018-03-19 thestig Add debugging info when gclient deletes an old DEPS entry. 2018-03-19 thestig Remove nested ifs in GClientSmokeBase.splitBlock(). Created with: roll-dep src/third_party/depot_tools BUG= chromium:760633 ,chromium:755920, chromium:823586 The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. TBR=agable@chromium.org Change-Id: I4a24b063813215bfa046139f4241bd8723063137 Reviewed-on: https://chromium-review.googlesource.com/972434 Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#544622} [modify] https://crrev.com/a22f1657cd9c991d47fbfa5b72689c93b0311a81/DEPS
,
Mar 21 2018
I can now reproduce this locally, so maybe all the work so far was not strictly necessary. Sigh. The relevant roll [6] finally landed and now we have debug data from [7]. ________ deleting 'pdfium/testing/gtest' in '/b/build/slave/mac_xfa/build' ________ because '/b/build/slave/mac_xfa/build/pdfium/testing/gtest' is not in: ['/b/build/slave/mac_xfa/build/pdfium', '/b/build/slave/mac_xfa/build/pdfium/base/trace_event/common', '/b/build/slave/mac_xfa/build/pdfium/build', '/b/build/slave/mac_xfa/build/pdfium/buildtools', '/b/build/slave/mac_xfa/build/pdfium/testing/corpus', '/b/build/slave/mac_xfa/build/pdfium/third_party/binutils', '/b/build/slave/mac_xfa/build/pdfium/third_party/depot_tools', '/b/build/slave/mac_xfa/build/pdfium/third_party/freetype/src', '/b/build/slave/mac_xfa/build/pdfium/third_party/googletest/src', '/b/build/slave/mac_xfa/build/pdfium/third_party/icu', '/b/build/slave/mac_xfa/build/pdfium/third_party/instrumented_libraries', '/b/build/slave/mac_xfa/build/pdfium/third_party/jinja2', '/b/build/slave/mac_xfa/build/pdfium/third_party/libjpeg_turbo', '/b/build/slave/mac_xfa/build/pdfium/third_party/markupsafe', '/b/build/slave/mac_xfa/build/pdfium/third_party/skia', '/b/build/slave/mac_xfa/build/pdfium/third_party/yasm/source/patched-yasm', '/b/build/slave/mac_xfa/build/pdfium/third_party/zlib', '/b/build/slave/mac_xfa/build/pdfium/tools/clang', '/b/build/slave/mac_xfa/build/pdfium/tools/gyp', '/b/build/slave/mac_xfa/build/pdfium/tools/memory', '/b/build/slave/mac_xfa/build/pdfium/v8', '/b/build/slave/mac_xfa/build/pdfium/buildtools/clang_format/script', '/b/build/slave/mac_xfa/build/pdfium/buildtools/third_party/libc++/trunk', '/b/build/slave/mac_xfa/build/pdfium/buildtools/third_party/libc++abi/trunk', '/b/build/slave/mac_xfa/build/pdfium/buildtools/third_party/libunwind/trunk'] [6] https://chromium-review.googlesource.com/974066 [7] https://build.chromium.org/p/tryserver.client.pdfium/builders/mac_xfa/builds/8935/steps/bot_update/logs/stdio
,
Mar 21 2018
So it looks like we can commit testing/{gmock,gtest}/dummy first, and that will make gclient recognize testing/{gmock,gtest} should not be deleted.
,
Mar 22 2018
The following revision refers to this bug: https://pdfium.googlesource.com/pdfium/+/0ad1b2e3e8e0f3bb22c5b96a9cfc9a3d011a56df commit 0ad1b2e3e8e0f3bb22c5b96a9cfc9a3d011a56df Author: Lei Zhang <thestig@chromium.org> Date: Thu Mar 22 04:58:44 2018 Add testing/{gmock,gtest}/dummy. This will help facilitate the transition for these two directories from DEPS checkouts to part of the parent git repo. Without any files in these directories, gclient will delete them when they are no longer in DEPS. BUG= chromium:823586 TBR=dsinclair@chromium.org Change-Id: I1841db87fddcb0b6a2ed9300a86349e09bda3160 Reviewed-on: https://pdfium-review.googlesource.com/29011 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org> [add] https://crrev.com/0ad1b2e3e8e0f3bb22c5b96a9cfc9a3d011a56df/testing/gtest/dummy [add] https://crrev.com/0ad1b2e3e8e0f3bb22c5b96a9cfc9a3d011a56df/testing/gmock/dummy
,
Mar 22 2018
Landed [1]. Cleaning up after myself now. Will close the bug when done. Thanks for helping and sorry for all the noise.
,
Mar 22 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/depot_tools/+/869a2857a4f3acc08fdec6182ecec5b73593be3b commit 869a2857a4f3acc08fdec6182ecec5b73593be3b Author: Lei Zhang <thestig@chromium.org> Date: Thu Mar 22 06:06:28 2018 Revert "Add debugging info when gclient deletes an old DEPS entry." This reverts commit 33bf49538c3c6cbffd50dc379c811f81fdf7383d. Reason for revert: Done debugging. Original change's description: > Add debugging info when gclient deletes an old DEPS entry. > > To help figure out why it decided to do so. > > BUG= 823586 > > Change-Id: I93d7c9f7af6145ee0ebd9f5ad4483f27925e84d6 > Reviewed-on: https://chromium-review.googlesource.com/970082 > Commit-Queue: Lei Zhang <thestig@chromium.org> > Reviewed-by: Aaron Gable <agable@chromium.org> TBR=thestig@chromium.org,agable@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: 823586 Change-Id: I476cbe423b849582f8684426653f0c08062e89e9 Reviewed-on: https://chromium-review.googlesource.com/974458 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org> [modify] https://crrev.com/869a2857a4f3acc08fdec6182ecec5b73593be3b/gclient.py [modify] https://crrev.com/869a2857a4f3acc08fdec6182ecec5b73593be3b/tests/gclient_smoketest.py
,
Mar 22 2018
,
Mar 22 2018
The following revision refers to this bug: https://pdfium.googlesource.com/pdfium/+/664faf66943c55acaacd53fb127662da9217d8d5 commit 664faf66943c55acaacd53fb127662da9217d8d5 Author: Lei Zhang <thestig@chromium.org> Date: Thu Mar 22 06:33:25 2018 Remove testing/{gmock,gtest}/dummy. BUG= chromium:823586 TBR=dsinclair@chromium.org Change-Id: Ifee58db77a19c9143b8773e78d102114f08143ae Reviewed-on: https://pdfium-review.googlesource.com/29030 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org> [delete] https://crrev.com/c5514276094022c62373a8a908f72754366d15e8/testing/gtest/dummy [delete] https://crrev.com/c5514276094022c62373a8a908f72754366d15e8/testing/gmock/dummy
,
Mar 22 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/5cf9d7588a44001204be4c8da8b36690f24608c7 commit 5cf9d7588a44001204be4c8da8b36690f24608c7 Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Date: Thu Mar 22 08:00:00 2018 Roll src/third_party/depot_tools/ 9f531298e..869a2857a (1 commit) https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/9f531298e1a3..869a2857a4f3 $ git log 9f531298e..869a2857a --date=short --no-merges --format='%ad %ae %s' 2018-03-22 thestig Revert "Add debugging info when gclient deletes an old DEPS entry." Created with: roll-dep src/third_party/depot_tools BUG= chromium:823586 The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. TBR=agable@chromium.org Change-Id: Ief0ad99707d16924e86b7b1f475310fc71bd7b82 Reviewed-on: https://chromium-review.googlesource.com/974897 Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#545008} [modify] https://crrev.com/5cf9d7588a44001204be4c8da8b36690f24608c7/DEPS
,
Mar 22 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/048fa4a97194953ba8995780d6dc461c7017da8f commit 048fa4a97194953ba8995780d6dc461c7017da8f Author: pdfium-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <pdfium-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Date: Thu Mar 22 08:23:38 2018 Roll src/third_party/pdfium/ 19a33e4ec..0f494c864 (5 commits) https://pdfium.googlesource.com/pdfium.git/+log/19a33e4ece99..0f494c86440d $ git log 19a33e4ec..0f494c864 --date=short --no-merges --format='%ad %ae %s' 2018-03-22 thestig Roll DEPS for buildtools to 3748a2a9 2018-03-22 thestig Roll DEPS for build to 4b1fc75d 2018-03-22 thestig Remove testing/{gmock,gtest}/dummy. 2018-03-22 thestig Update gtest and gmock to 1.8.x. 2018-03-22 thestig Add testing/{gmock,gtest}/dummy. Created with: roll-dep src/third_party/pdfium BUG= chromium:823586 , chromium:823586 The AutoRoll server is located here: https://pdfium-roll.skia.org Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. TBR=dsinclair@chromium.org Change-Id: I23df90f832e9981f4c07702dabdb325b155055f4 Reviewed-on: https://chromium-review.googlesource.com/974901 Commit-Queue: pdfium-chromium-autoroll <pdfium-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Reviewed-by: pdfium-chromium-autoroll <pdfium-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#545011} [modify] https://crrev.com/048fa4a97194953ba8995780d6dc461c7017da8f/DEPS
,
Mar 22 2018
The following revision refers to this bug: https://chromium.googlesource.com/v8/v8.git/+/f6bf3ce92e2f600964516d88a21e37447959569a commit f6bf3ce92e2f600964516d88a21e37447959569a Author: Victor Costan <pwnall@chromium.org> Date: Thu Mar 22 18:23:01 2018 Add testing/{gtest,gmock}/dummy to facilitate rolling googletest. googletest's directory structure has completely changed, and trybots have trouble with the roll CL https://crrev.com/c/639953 because of https://crbug.com/823586 . This CL works aroud the bug above, using the same method as https://pdfium-review.googlesource.com/c/pdfium/+/29011 which helped land https://pdfium-review.googlesource.com/c/pdfium/+/28791. Bug: chromium:823586 Change-Id: Iffce1277c6b73b5cea96465a6035380cba0d103c Reviewed-on: https://chromium-review.googlesource.com/974917 Reviewed-by: Michael Achenbach <machenbach@chromium.org> Commit-Queue: Victor Costan <pwnall@chromium.org> Cr-Commit-Position: refs/heads/master@{#52161} [add] https://crrev.com/f6bf3ce92e2f600964516d88a21e37447959569a/testing/dummy [add] https://crrev.com/f6bf3ce92e2f600964516d88a21e37447959569a/testing/gmock/dummy [add] https://crrev.com/f6bf3ce92e2f600964516d88a21e37447959569a/testing/gtest/dummy
,
Mar 22 2018
There's nothing confidential here, so removing RVG. |
|||||
►
Sign in to add a comment |
|||||
Comment 1 by thestig@chromium.org
, Mar 20 2018Owner: thestig@chromium.org
Status: Started (was: Untriaged)