← Back to branch summary

~gnuoy/charms/trusty/percona-cluster/use-dc-stable

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/database/mysql.py

  • Committer: Liam Young
  • Date: 2015-06-08 12:07:43 UTC
  • Revision ID: liam.young@canonical.com-20150608120743-3hlgih1q0zju6f77
https://launchpad.net/bugs/1452365
Backport of fix for Bug#1452365. Charmhelper sync + switch to using DC_RESOURCE_NAME for leader election

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/database/mysql.py
385
385
        mysql_config['key_buffer'] = self.human_to_bytes('32M')
386
386
        total_memory = self.human_to_bytes(self.get_mem_total())
387
387
 
388
 
        dataset_bytes = config.get('dataset-size', None)
 
388
        log("Option 'dataset-size' has been deprecated, instead by default %d%% of system \
 
389
        available RAM will be used for innodb_buffer_pool_size allocation" %
 
390
            (self.DEFAULT_INNODB_BUFFER_FACTOR * 100), level="WARN")
 
391
 
389
392
        innodb_buffer_pool_size = config.get('innodb-buffer-pool-size', None)
390
393
 
391
394
        if innodb_buffer_pool_size:
392
395
            innodb_buffer_pool_size = self.human_to_bytes(
393
396
                innodb_buffer_pool_size)
394
 
        elif dataset_bytes:
395
 
            log("Option 'dataset-size' has been deprecated, please use"
396
 
                "innodb_buffer_pool_size option instead", level="WARN")
397
 
            innodb_buffer_pool_size = self.human_to_bytes(
398
 
                dataset_bytes)
 
397
 
 
398
            if innodb_buffer_pool_size > total_memory:
 
399
                log("innodb_buffer_pool_size; {} is greater than system available memory:{}".format(
 
400
                    innodb_buffer_pool_size,
 
401
                    total_memory), level='WARN')
399
402
        else:
400
403
            innodb_buffer_pool_size = int(
401
404
                total_memory * self.DEFAULT_INNODB_BUFFER_FACTOR)
402
405
 
403
 
        if innodb_buffer_pool_size > total_memory:
404
 
            log("innodb_buffer_pool_size; {} is greater than system available memory:{}".format(
405
 
                innodb_buffer_pool_size,
406
 
                total_memory), level='WARN')
407
 
 
408
406
        mysql_config['innodb_buffer_pool_size'] = innodb_buffer_pool_size
409
407
        return mysql_config