From d184f0aef212bf442669b954d4a812dc95b770fa Mon Sep 17 00:00:00 2001
From: Russell Brown <russell.brown@mac.com>
Date: Thu, 25 Oct 2012 14:03:33 +0100
Subject: [PATCH 6/6] Fix stats for r15b02 due

OTP team removed the erlang:system_info(global_heap_size) stat
and so riak-admin status and riak stats fail hard.

This commit wraps the call to said stat in a try catch. On < 15b02
you get global heapsize. Otherwise you get the atom 'deprecated'.
---
 src/riak_kv_stat.erl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/riak_kv_stat.erl b/src/riak_kv_stat.erl
index 6cd5240..b55c2fc 100644
--- a/src/riak_kv_stat.erl
+++ b/src/riak_kv_stat.erl
@@ -418,7 +418,7 @@ system_stats() ->
     [{nodename, node()},
      {connected_nodes, nodes()},
      {sys_driver_version, list_to_binary(erlang:system_info(driver_version))},
-     {sys_global_heaps_size, erlang:system_info(global_heaps_size)},
+     {sys_global_heaps_size, safe_global_heap_size()},
      {sys_heap_type, erlang:system_info(heap_type)},
      {sys_logical_processors, erlang:system_info(logical_processors)},
      {sys_otp_release, list_to_binary(erlang:system_info(otp_release))},
@@ -430,6 +430,14 @@ system_stats() ->
      {sys_thread_pool_size, erlang:system_info(thread_pool_size)},
      {sys_wordsize, erlang:system_info(wordsize)}].
 
+safe_global_heap_size() ->
+    try erlang:system_info(global_heaps_size) of
+        N -> N
+    catch
+        error:badarg ->
+            deprecated
+    end.
+
 app_stats() ->
     [{list_to_atom(atom_to_list(A) ++ "_version"), list_to_binary(V)}
      || {A,_,V} <- application:which_applications()].
-- 
1.7.12.1