Browse Source

Merge pull request #8622 from ghalliday/issue15518

HPCC-15518 Do not dump an out of memory report if memory not required

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 years ago
parent
commit
e6b106589a
1 changed files with 4 additions and 2 deletions
  1. 4 2
      roxie/roxiemem/roxiemem.cpp

+ 4 - 2
roxie/roxiemem/roxiemem.cpp

@@ -3801,7 +3801,8 @@ public:
         catch (IException *e)
         {
             EXCLOG(e, "CChunkingRowManager::allocate(memsize_t _size, unsigned activityId, unsigned maxSpillCost)");
-            doOomReport();
+            if (maxSpillCost == SpillAllCost)
+                doOomReport();
             throw;
         }
     }
@@ -3907,7 +3908,8 @@ public:
             catch (IException *e)
             {
                 EXCLOG(e, "CChunkingRowManager::resizeRow(void * original, memsize_t copysize, memsize_t newsize, unsigned activityId, unsigned maxSpillCost, IRowResizeCallback & callback)");
-                doOomReport();
+                if (maxSpillCost == SpillAllCost)
+                    doOomReport();
                 throw;
             }
         }