Use Share Group rather than Client ID in GPU memory logs

Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.perf:android_s5_perf_cq;tryserver.chromium.perf:mac_retina_perf_cq

Committed: https://crrev.com/3b37a9689b42738426fdbf9b225d224e704a5af7
Cr-Commit-Position: refs/heads/master@{#405391}

[ericrk, 2016-07-08 21:03:57]

Description was changed from

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
==========

to

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:android_s5_perf_cq;tryserver.chromium.perf:mac_retina_perf_cq
==========

[ericrk, 2016-07-08 21:03:57]

Description was changed from

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:android_s5_perf_cq;tryserver.chromium.perf:mac_retina_perf_cq
==========

to

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel
==========

[ericrk, 2016-07-08 21:53:07]

Description was changed from

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel
==========

to

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel
CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:android_s5_perf_cq;tryserver.chromium.perf:mac_retina_perf_cq
==========

[ericrk, 2016-07-08 21:53:26]

Patchset #1 (id:1) has been deleted

[ericrk, 2016-07-08 21:55:32]

ericrk@chromium.org changed reviewers:
+ petrcermak@chromium.org

[ericrk, 2016-07-08 21:55:33]

https://codereview.chromium.org/2133743003/diff/20001/tools/perf/benchmarks/s...
File tools/perf/benchmarks/system_health_smoke_test.py (left):

https://codereview.chromium.org/2133743003/diff/20001/tools/perf/benchmarks/s...
tools/perf/benchmarks/system_health_smoke_test.py:44: # crbug.com/624701
I've confirmed that this (and the following tests) all pass for me locally after
my fix. The bug mentioned below (624840) has been fixed, as well.

[petrcermak, 2016-07-11 07:35:04]

LGTM. Thanks!

Petr

https://codereview.chromium.org/2133743003/diff/20001/tools/perf/benchmarks/s...
File tools/perf/benchmarks/system_health_smoke_test.py (left):

https://codereview.chromium.org/2133743003/diff/20001/tools/perf/benchmarks/s...
tools/perf/benchmarks/system_health_smoke_test.py:44: # crbug.com/624701
On 2016/07/08 21:55:32, ericrk wrote:
> I've confirmed that this (and the following tests) all pass for me locally
after
> my fix. The bug mentioned below (624840) has been fixed, as well.

Great, thanks :-)

[ericrk, 2016-07-11 17:38:15]

ericrk@chromium.org changed reviewers:
+ sievers@chromium.org

[ericrk, 2016-07-11 17:38:16]

+sievers@ for addl owners. Thanks!

[no sievers, 2016-07-11 18:57:00]

lgtm

[ericrk, 2016-07-11 18:57:47]

The CQ bit was checked by ericrk@chromium.org

[commit-bot: I haz the power, 2016-07-11 18:58:10]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-11 18:58:12]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-11 19:01:57]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-11 19:32:00]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-11 19:34:44]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-07-11 19:34:45]

Try jobs failed on following builders:
  win_chromium_compile_dbg_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_comp...)

[ericrk, 2016-07-11 22:20:38]

The CQ bit was checked by ericrk@chromium.org

[ericrk, 2016-07-11 22:20:38]

The patchset sent to the CQ was uploaded after l-g-t-m from
sievers@chromium.org, petrcermak@chromium.org
Link to the patchset: https://codereview.chromium.org/2133743003/#ps40001
(title: "Add missing #include for windows")

[commit-bot: I haz the power, 2016-07-11 22:21:35]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-11 22:21:36]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-11 22:32:03]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-11 23:02:00]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-11 23:32:24]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-11 23:47:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-07-11 23:47:30]

Try jobs failed on following builders:
  linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[ericrk, 2016-07-12 01:01:50]

The CQ bit was checked by ericrk@chromium.org

[commit-bot: I haz the power, 2016-07-12 01:03:15]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-12 01:03:16]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 01:31:50]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 02:02:02]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 02:32:04]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 02:33:48]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-07-12 02:33:49]

Try jobs failed on following builders:
  linux_chromium_chromeos_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[ericrk, 2016-07-12 17:56:59]

The CQ bit was checked by ericrk@chromium.org

[commit-bot: I haz the power, 2016-07-12 17:57:58]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-12 17:58:00]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 18:02:51]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 18:32:25]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 19:03:31]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 19:33:22]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 20:03:59]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 20:33:44]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 21:04:01]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 21:34:57]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 22:04:25]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 22:34:52]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 23:03:44]

There were warnings when CQ was processing your CL:
 * CQ_EXTRA_TRYBOTS flag is deprecated and will soon be removed. Use
CQ_INCLUDE_TRYBOTS instead.

[commit-bot: I haz the power, 2016-07-12 23:07:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-07-12 23:07:15]

Try jobs failed on following builders:
  linux_chromium_asan_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[ericrk, 2016-07-13 17:27:26]

Description was changed from

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel
CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:android_s5_perf_cq;tryserver.chromium.perf:mac_retina_perf_cq
==========

to

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel,tryserver.chromium.perf:android_s5_perf_cq;tryserver.chromium.perf:mac_retina_perf_cq
==========

[ericrk, 2016-07-13 17:27:35]

The CQ bit was checked by ericrk@chromium.org

[commit-bot: I haz the power, 2016-07-13 17:28:01]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-13 17:28:03]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-07-13 17:28:04]

Transient error: Too many
"tryserver.chromium.win:win_optional_gpu_tests_rel,tryserver.chromium.perf:android_s5_perf_cq"
delimiters in ":".
Correct syntax is "tryserver:bot1,bot2;tryserver2:bot3,bot4;".

[ericrk, 2016-07-13 22:39:55]

Description was changed from

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel,tryserver.chromium.perf:android_s5_perf_cq;tryserver.chromium.perf:mac_retina_perf_cq
==========

to

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.perf:android_s5_perf_cq;tryserver.chromium.perf:mac_retina_perf_cq
==========

[ericrk, 2016-07-13 22:40:01]

The CQ bit was checked by ericrk@chromium.org

[commit-bot: I haz the power, 2016-07-13 22:40:40]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-14 01:36:11]

Description was changed from

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.perf:android_s5_perf_cq;tryserver.chromium.perf:mac_retina_perf_cq
==========

to

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.perf:android_s5_perf_cq;tryserver.chromium.perf:mac_retina_perf_cq
==========

[commit-bot: I haz the power, 2016-07-14 01:36:14]

Committed patchset #2 (id:40001)

[commit-bot: I haz the power, 2016-07-14 01:37:54]

Description was changed from

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.perf:android_s5_perf_cq;tryserver.chromium.perf:mac_retina_perf_cq
==========

to

==========
Use Share Group rather than Client ID in GPU memory logs

Currently, TextureManager and BufferManager in the GPU process log
memory allocations in the form "gpu/gl/client_X/texture|buffer_X",
unfortunately, a single client can have multiple textures or buffers
with the same ID. IDs are only unique within a ShareGroup, not a
client.

To avoid these duplicate entries, this CL moves to logging these
values as "gpu/gl/share_group_X/texture|buffer_X". This ensures that
each entry will have a unique name.

BUG=624701
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.perf:android_s5_perf_cq;tryserver.chromium.perf:mac_retina_perf_cq

Committed: https://crrev.com/3b37a9689b42738426fdbf9b225d224e704a5af7
Cr-Commit-Position: refs/heads/master@{#405391}
==========

[commit-bot: I haz the power, 2016-07-14 01:37:55]

Patchset 2 (id:??) landed as
https://crrev.com/3b37a9689b42738426fdbf9b225d224e704a5af7
Cr-Commit-Position: refs/heads/master@{#405391}