New issue
Advanced search Search tips

Issue 682372 link

Starred by 2 users

Issue metadata

Status: Fixed
Owner:
Closed: Jan 2017
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 1
Type: Bug



Sign in to add a comment

Some v8 trybots failing to apply patch with "file does not exist in index"

Project Member Reported by gsat...@chromium.org, Jan 18 2017

Issue description

The patchset isn't correctly applied when running the CQ. 

See -- https://codereview.chromium.org/2644723002/

Some platforms work fine but others fail with this error -


Failed to apply patch for src/runtime/runtime-object.cc:
While running git apply --index -3 -p1 --verbose;
  Checking patch src/runtime/runtime-object.cc...
  error: src/runtime/runtime-object.cc: does not exist in index

See --
https://build.chromium.org/p/tryserver.v8/builders/v8_linux64_avx2_rel_ng/builds/15429/steps/bot_update/logs/patch%20error


On a clean build of V8, I'm able to run `git cl patch  https://codereview.chromium.org/2644723002/` and the patch applies fine.
 
Cc: machenb...@chromium.org
Labels: Infra-Troopers

Comment 3 by aga...@chromium.org, Jan 18 2017

Cc: seanmccullough@chromium.org
Labels: -Pri-3 Pri-1
Summary: Some v8 trybots failing to apply patch with "file does not exist in index" (was: CQ isn't able to apply patches correctly)
Updating metadata for faster triage
Components: Infra
Strange that CL seems to have passed v8_linux64_avx2_rel_ng since this was filed. Did you resync your checkout and retry CQ? 
I did not resync and retry.
Looks like there's a b0rked checkout on some of those machines. 
"""
Applying the patch from https://codereview.chromium.org/2644723002/#ps1
Found extra files: ['src/runtime/runtime-object.cc']
"""

IIUC git is confused by the presence of an *untracked* copy of src/runtime/runtime-object.cc that's somehow already on the slave before bot_update runs. This is not a recently added or removed file (based on git history of it). 

I'll try clobbering the checkout dir on one of the failing slaves.

ran this on slave1204-c4 slave586-c4 and slave871-c4:

chrome-bot@slave871-c4:(Linux 14.04):/b/build/slave/linux_nodcheck/build/v8$ git status
HEAD detached at origin/master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   src/compiler/ia32/code-generator-ia32.cc
        modified:   test/cctest/wasm/test-run-wasm-64.cc
        new file:   test/mjsunit/regress/wasm/regression-5800.js

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git rm <file>..." to mark resolution)

        both deleted:    src/runtime/runtime-object.cc

chrome-bot@slave871-c4:(Linux 14.04):/b/build/slave/linux_nodcheck/build/v8$ git reset HEAD src/runtime/runtime-object.cc
chrome-bot@slave871-c4:(Linux 14.04):/b/build/slave/linux_nodcheck/build/v8$ git status
HEAD detached at origin/master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   src/compiler/ia32/code-generator-ia32.cc
        modified:   test/cctest/wasm/test-run-wasm-64.cc
        new file:   test/mjsunit/regress/wasm/regression-5800.js
And slave407-c4 just now too.
Status: Fixed (was: Untriaged)
I think the patch step is succeeding now. Reopen if you see this again.
Awesome, thanks!
Owner: seanmccullough@chromium.org
Status: Assigned (was: Fixed)
It's still happening. I patched https://codereview.chromium.org/2644723002/ into a new CL https://codereview.chromium.org/2639333004 and see the same errors.

This is what I did -- https://paste.googleplex.com/6145129031139328
vm880-m4 vm204-m4 vm205-m4 slave589-c4 slave411-c4 slave1207-c4 slave415-c4 are doing this now too. WTF is up with these checkouts?
 
I'm not sure what's happening, maybe you can try using git new-branch instead?

Though https://www.chromium.org/developers/how-tos/get-the-code/working-with-branches claim they are equivalent, I think there might be a subtle difference?


I just tried the same now with new branch, but my toy CL fails too:
https://codereview.chromium.org/2641953003/
Note this doesn't repro locally. Calling
apply_issue -i 2644723002

Everything applies just fine...

Is this still preventing you from getting this CL through CQ? 
Haven't tried updating the CL with review changes yet. Will update this bug once I have an updated patchset and run the trybots
Status: Fixed (was: Assigned)
I was able to land the CL without any problems. Closing.

Sign in to add a comment