Merge lp:~marcoceppi/charms/precise/mysql/32bit-fix into lp:charms/mysql

[Marco Ceppi]

[Clint Byrum (clint-fewbar)]

Note that I added a check for OverflowError upon merging, because you can't compare an int to a long without raising that.

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-09-13 22:49:49 +0000
+++ hooks/config-changed	2012-11-05 21:41:18 +0000
@@ -14,6 +14,11 @@
 # Going for the biggest page size to avoid wasted bytes. InnoDB page size is
 # 16MB
 PAGE_SIZE = 16*1024*1024
+32BIT_SYSTEM = sys.maxsize < 2**32
+32BIT_MEM_LIMIT = human_to_bytes('4G')
+
+if 32BIT_SYSTEM:
+    check_call(['juju-log','-l','INFO','32bit system restrictions in play'])
 
 configs=json.loads(check_output(['config-get','--format=json']))
 
@@ -37,6 +42,10 @@
         return int(human[:-1]) * factors[modifier]
     if modifier == '%':
         total_ram = human_to_bytes(get_memtotal())
+
+        if 32BIT_SYSTEM and total_ram > 32BIT_MEM_LIMIT:
+            total_ram = 32BIT_MEM_LIMIT
+
         factor = int(human[:-1]) * 0.01
         pctram = total_ram * factor
         return int(pctram - (pctram % PAGE_SIZE))