Chromium Code Reviews
|
|
Chromium Code Reviews
Issue
2240853002:
Revert of Logdog for logcats (Closed)
DescriptionRevert of Logdog for logcats (patchset #25 id:500001 of https://codereview.chromium.org/2163833003/ )
Reason for revert:
This CL crashed mojo_test_apk on Android. See details at crbug.com/637213
Original issue's description:
> Add logdog_butler cipd package to every swarming gtest_test on android tryservers (linux_android_rel_ng, android_n5x_swarming_rel).
>
> Add wrapper around android test runner for swarming tasks. This wrapper calls logdog to stream logcats after the completion of the python executable calling test_runner.
>
> Adding device serials to every line of logcat logs.
>
> Sample of unified logcats: https://luci-logdog.appspot.com/v/?s=chromium%2Fswarming%2F301f0f97eea1a511%2Flogcats%2F%2B%2Ffile:_b_swarm_slave_w_ioVXQmGw_logcats
>
> BUG=448050
>
> Committed: https://crrev.com/3dbe50ffaca641ea962d385e2ac9ac0bec75fbbb
> Cr-Commit-Position: refs/heads/master@{#411530}
TBR=jbudorick@chromium.org,stip@chromium.org,dnj@chromium.org,dpranke@chromium.org,vadimsh@chromium.org,maruel@chromium.org,nicholaslin@google.com
BUG=448050
Patch Set 1 #
Messages
Total messages: 19 (11 generated)
The CQ bit was checked by kolos@chromium.org
Created Revert of Logdog for logcats
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for testing/buildbot/chromium.linux.json:
While running git apply --index -3 -p1;
error: patch failed: testing/buildbot/chromium.linux.json:527
error: repository lacks the necessary blob to fall back on 3-way merge.
error: testing/buildbot/chromium.linux.json: patch does not apply
Patch: testing/buildbot/chromium.linux.json
Index: testing/buildbot/chromium.linux.json
diff --git a/testing/buildbot/chromium.linux.json
b/testing/buildbot/chromium.linux.json
index
5b4719095b8ef870ec4f0a0c337cb14d0a002437..f04ba7ecbeeb1554a501399de15ff132001cb850
100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -29,91 +29,40 @@
"override_isolate_target": "android_webview_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
+ "dimension_sets": [
+ {
+ "android_devices": "6",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
}
],
- "dimension_sets": [
- {
- "android_devices": "6",
- "device_os": "KTU84P",
- "device_type": "hammerhead"
- }
- ],
- "hard_timeout": 960,
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
+ "hard_timeout": 960
+ },
+ "test": "android_webview_test_apk"
+ },
+ {
+ "override_isolate_target": "android_webview_unittests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "android_devices": "4",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
}
]
},
- "test": "android_webview_test_apk"
- },
- {
- "override_isolate_target": "android_webview_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
- }
- ],
- "dimension_sets": [
- {
- "android_devices": "4",
- "device_os": "KTU84P",
- "device_type": "hammerhead"
- }
- ],
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
- }
- ]
- },
"test": "android_webview_unittests"
},
{
"override_isolate_target": "base_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
- }
- ],
- "dimension_sets": [
- {
- "android_devices": "4",
- "device_os": "KTU84P",
- "device_type": "hammerhead"
- }
- ],
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
+ "dimension_sets": [
+ {
+ "android_devices": "4",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
}
]
},
@@ -126,13 +75,35 @@
"override_isolate_target": "blimp_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
+ "dimension_sets": [
+ {
+ "android_devices": "4",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
}
],
+ "hard_timeout": 600
+ },
+ "test": "blimp_test_apk"
+ },
+ {
+ "override_isolate_target": "blimp_unittests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "android_devices": "4",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
+ }
+ ]
+ },
+ "test": "blimp_unittests"
+ },
+ {
+ "override_isolate_target": "blink_heap_unittests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"android_devices": "4",
@@ -140,171 +111,47 @@
"device_type": "hammerhead"
}
],
- "hard_timeout": 600,
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
+ "hard_timeout": 120
+ },
+ "test": "blink_heap_unittests"
+ },
+ {
+ "override_isolate_target": "breakpad_unittests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "android_devices": "4",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
}
]
},
- "test": "blimp_test_apk"
- },
- {
- "override_isolate_target": "blimp_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
- }
- ],
- "dimension_sets": [
- {
- "android_devices": "4",
- "device_os": "KTU84P",
- "device_type": "hammerhead"
- }
- ],
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
+ "test": "breakpad_unittests"
+ },
+ {
+ "override_isolate_target": "capture_unittests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "android_devices": "4",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
}
]
},
- "test": "blimp_unittests"
- },
- {
- "override_isolate_target": "blink_heap_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
- }
- ],
- "dimension_sets": [
- {
- "android_devices": "4",
- "device_os": "KTU84P",
- "device_type": "hammerhead"
- }
- ],
- "hard_timeout": 120,
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
- }
- ]
- },
- "test": "blink_heap_unittests"
- },
- {
- "override_isolate_target": "breakpad_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
- }
- ],
- "dimension_sets": [
- {
- "android_devices": "4",
- "device_os": "KTU84P",
- "device_type": "hammerhead"
- }
- ],
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
- }
- ]
- },
- "test": "breakpad_unittests"
-…
(message too large)
The CQ bit was checked by kolos@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
The CQ bit was checked by kolos@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for testing/buildbot/chromium.linux.json:
While running git apply --index -3 -p1;
error: patch failed: testing/buildbot/chromium.linux.json:527
error: repository lacks the necessary blob to fall back on 3-way merge.
error: testing/buildbot/chromium.linux.json: patch does not apply
Patch: testing/buildbot/chromium.linux.json
Index: testing/buildbot/chromium.linux.json
diff --git a/testing/buildbot/chromium.linux.json
b/testing/buildbot/chromium.linux.json
index
5b4719095b8ef870ec4f0a0c337cb14d0a002437..f04ba7ecbeeb1554a501399de15ff132001cb850
100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -29,91 +29,40 @@
"override_isolate_target": "android_webview_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
+ "dimension_sets": [
+ {
+ "android_devices": "6",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
}
],
- "dimension_sets": [
- {
- "android_devices": "6",
- "device_os": "KTU84P",
- "device_type": "hammerhead"
- }
- ],
- "hard_timeout": 960,
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
+ "hard_timeout": 960
+ },
+ "test": "android_webview_test_apk"
+ },
+ {
+ "override_isolate_target": "android_webview_unittests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "android_devices": "4",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
}
]
},
- "test": "android_webview_test_apk"
- },
- {
- "override_isolate_target": "android_webview_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
- }
- ],
- "dimension_sets": [
- {
- "android_devices": "4",
- "device_os": "KTU84P",
- "device_type": "hammerhead"
- }
- ],
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
- }
- ]
- },
"test": "android_webview_unittests"
},
{
"override_isolate_target": "base_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
- }
- ],
- "dimension_sets": [
- {
- "android_devices": "4",
- "device_os": "KTU84P",
- "device_type": "hammerhead"
- }
- ],
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
+ "dimension_sets": [
+ {
+ "android_devices": "4",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
}
]
},
@@ -126,13 +75,35 @@
"override_isolate_target": "blimp_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
+ "dimension_sets": [
+ {
+ "android_devices": "4",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
}
],
+ "hard_timeout": 600
+ },
+ "test": "blimp_test_apk"
+ },
+ {
+ "override_isolate_target": "blimp_unittests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "android_devices": "4",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
+ }
+ ]
+ },
+ "test": "blimp_unittests"
+ },
+ {
+ "override_isolate_target": "blink_heap_unittests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"android_devices": "4",
@@ -140,171 +111,47 @@
"device_type": "hammerhead"
}
],
- "hard_timeout": 600,
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
+ "hard_timeout": 120
+ },
+ "test": "blink_heap_unittests"
+ },
+ {
+ "override_isolate_target": "breakpad_unittests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "android_devices": "4",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
}
]
},
- "test": "blimp_test_apk"
- },
- {
- "override_isolate_target": "blimp_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
- }
- ],
- "dimension_sets": [
- {
- "android_devices": "4",
- "device_os": "KTU84P",
- "device_type": "hammerhead"
- }
- ],
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
+ "test": "breakpad_unittests"
+ },
+ {
+ "override_isolate_target": "capture_unittests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "android_devices": "4",
+ "device_os": "KTU84P",
+ "device_type": "hammerhead"
}
]
},
- "test": "blimp_unittests"
- },
- {
- "override_isolate_target": "blink_heap_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
- }
- ],
- "dimension_sets": [
- {
- "android_devices": "4",
- "device_os": "KTU84P",
- "device_type": "hammerhead"
- }
- ],
- "hard_timeout": 120,
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
- }
- ]
- },
- "test": "blink_heap_unittests"
- },
- {
- "override_isolate_target": "breakpad_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision":
"git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
- }
- ],
- "dimension_sets": [
- {
- "android_devices": "4",
- "device_os": "KTU84P",
- "device_type": "hammerhead"
- }
- ],
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
- }
- ]
- },
- "test": "breakpad_unittests"
-…
(message too large)
Description was changed from ========== Revert of Logdog for logcats (patchset #25 id:500001 of https://codereview.chromium.org/2163833003/ ) Reason for revert: This CL crashed mojo_test_apk on Android. See details at crbug.com/637213 Original issue's description: > Add logdog_butler cipd package to every swarming gtest_test on android tryservers (linux_android_rel_ng, android_n5x_swarming_rel). > > Add wrapper around android test runner for swarming tasks. This wrapper calls logdog to stream logcats after the completion of the python executable calling test_runner. > > Adding device serials to every line of logcat logs. > > Sample of unified logcats: https://luci-logdog.appspot.com/v/?s=chromium%2Fswarming%2F301f0f97eea1a511%2... > > BUG=448050 > > Committed: https://crrev.com/3dbe50ffaca641ea962d385e2ac9ac0bec75fbbb > Cr-Commit-Position: refs/heads/master@{#411530} TBR=jbudorick@chromium.org,stip@chromium.org,dnj@chromium.org,dpranke@chromiu... # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=448050 ========== to ========== Revert of Logdog for logcats (patchset #25 id:500001 of https://codereview.chromium.org/2163833003/ ) Reason for revert: This CL crashed mojo_test_apk on Android. See details at crbug.com/637213 Original issue's description: > Add logdog_butler cipd package to every swarming gtest_test on android tryservers (linux_android_rel_ng, android_n5x_swarming_rel). > > Add wrapper around android test runner for swarming tasks. This wrapper calls logdog to stream logcats after the completion of the python executable calling test_runner. > > Adding device serials to every line of logcat logs. > > Sample of unified logcats: https://luci-logdog.appspot.com/v/?s=chromium%2Fswarming%2F301f0f97eea1a511%2... > > BUG=448050 > > Committed: https://crrev.com/3dbe50ffaca641ea962d385e2ac9ac0bec75fbbb > Cr-Commit-Position: refs/heads/master@{#411530} TBR=jbudorick@chromium.org,stip@chromium.org,dnj@chromium.org,dpranke@chromiu... BUG=448050 ==========
The CQ bit was checked by kolos@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...) mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)
I think we can close this for now. |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
