[pve-devel] [PATCH pve-manager] Remove swap/memory limit in the Manager, fixes #1799

Thomas Lamprecht t.lamprecht at proxmox.com
Thu Jun 7 11:42:52 CEST 2018


On 6/7/18 11:02 AM, René Jochum wrote:
> ---
>  www/manager6/lxc/ResourceEdit.js  | 2 --
>  www/manager6/qemu/HardwareView.js | 4 ++--
>  www/manager6/qemu/MemoryEdit.js   | 3 ---
>  3 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/www/manager6/lxc/ResourceEdit.js b/www/manager6/lxc/ResourceEdit.js
> index ec697cac..395fab7e 100644
> --- a/www/manager6/lxc/ResourceEdit.js
> +++ b/www/manager6/lxc/ResourceEdit.js
> @@ -118,7 +118,6 @@ Ext.define('PVE.lxc.MemoryInputPanel', {
>  		xtype: 'proxmoxintegerfield',
>  		name: 'memory',
>  		minValue: 16,
> -		maxValue: 512*1024,
>  		value: '512',
>  		step: 32,
>  		fieldLabel: gettext('Memory') + ' (MiB)',
> @@ -129,7 +128,6 @@ Ext.define('PVE.lxc.MemoryInputPanel', {
>  		xtype: 'proxmoxintegerfield',
>  		name: 'swap',
>  		minValue: 0,
> -		maxValue: 128*1024,
>  		value: '512',
>  		step: 32,
>  		fieldLabel: gettext('Swap') + ' (MiB)',
> diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
> index a87a9df1..44153f7a 100644
> --- a/www/manager6/qemu/HardwareView.js
> +++ b/www/manager6/qemu/HardwareView.js
> @@ -54,11 +54,11 @@ Ext.define('PVE.qemu.HardwareView', {
>  		renderer: function(value, metaData, record, ri, ci, store, pending) {
>  		    var res = '';
>  
> -		    var max = me.getObjectValue('memory', 512, pending);
> +		    var value = me.getObjectValue('memory', undefined, pending);

# make lint
[...]
[qemu/HardwareView.js] Lint at line 57 character 9: 'value' is already defined.
var value = me.getObjectValue('memory', undefined, pending);

>  		    var balloon =  me.getObjectValue('balloon', undefined, pending);
>  		    var shares = me.getObjectValue('shares', undefined, pending);
>  
> -		    res  = Proxmox.Utils.format_size(max*1024*1024);
> +		    res  = Proxmox.Utils.format_size(value*1024*1024);
>  
>  		    if (balloon !== undefined && balloon > 0) {
>  			res = Proxmox.Utils.format_size(balloon*1024*1024) + "/" + res;
> diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js
> index 384351b0..0490cfb4 100644
> --- a/www/manager6/qemu/MemoryEdit.js
> +++ b/www/manager6/qemu/MemoryEdit.js
> @@ -39,14 +39,12 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
>  		fieldLabel: gettext('Memory') + ' (MiB)',
>  		name: 'memory',
>  		minValue: 1,
> -		maxValue: 512*1024,
>  		step: 32,
>  		hotplug: me.hotplug,
>  		listeners: {
>  		    change: function(f, value, old) {
>  			var bf = me.down('field[name=balloon]');
>  			var balloon = bf.getValue();
> -			bf.setMaxValue(value);

You sure about that? AFAIK, now I can set more ballooning minimum memory then
the VM can get in total...

>  			if (balloon === old) {
>  			    bf.setValue(value);
>  			}
> @@ -61,7 +59,6 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
>  		xtype: 'pveMemoryField',
>  		name: 'balloon',
>  		minValue: 1,
> -		maxValue: 512*1024,
>  		step: 32,
>  		fieldLabel: gettext('Minimum memory') + ' (MiB)',
>  		hotplug: me.hotplug,
> 





More information about the pve-devel mailing list