# HG changeset patch
# User drwhite
# Date 1428007344 14400
# Node ID e36165b16dde8b4eff9a7c529a9b76c72053436f
# Parent  3d95cca71acebdc004cdbecaf1905c24c948b7c5
8069004: Kitchensink hanged with 16Gb heap and GC pause >30 min
Summary: Revert bug introduced a few months ago.
Reviewed-by: brutisso, tschatzl, jmasa

diff -r 3d95cca71ace -r e36165b16dde hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp	Thu Apr 02 18:53:45 2015 +0300
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp	Thu Apr 02 16:42:24 2015 -0400
@@ -330,8 +330,12 @@
         assert(!hrclaimer->is_region_claimed(ch_index),
                "Must not have been claimed yet because claiming of humongous continuation first claims the start region");
 
-        // There's no need to actually claim the continues humongous region, but we can do it in an assert as an extra precaution.
-        assert(hrclaimer->claim_region(ch_index), "We should always be able to claim the continuesHumongous part of the humongous object");
+        // Claim the region so no other worker tries to process the region. When a worker processes a
+        // starts_humongous region it may also process the associated continues_humongous regions.
+        // The continues_humongous regions can be changed to free regions. Unless this worker claims
+        // all of these regions, other workers might try claim and process these newly free regions.
+        bool claim_result = hrclaimer->claim_region(ch_index);
+        guarantee(claim_result, "We should always be able to claim the continuesHumongous part of the humongous object");
 
         bool res2 = blk->doHeapRegion(chr);
         if (res2) {