Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [story#60132,done,4h,0h] historical records display values before and after changes.

Browse Source
This commit is contained in:
zhaixiaojian
2024-07-16 09:08:48 +08:00
committed by 丁国栋
parent b21e01841b
commit c4f5cd1355
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/instance/control.php
+8 -2
View File
@@ -109,6 +109,7 @@ class instance extends control
if($memoryKb * 1024 > $freeMemory) $this->send(array('result' => 'fail', 'message' => $this->lang->instance->errors->notEnoughResource));
/* Request CNE to adjust memory size. */
$instance->oldVal = $currentResource->max->memory;
if(!$this->instance->updateMemorySize($instance, $memoryKb * 1024))
{
return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -116,15 +117,20 @@ class instance extends control
}
$cpu = $newInstance->cpu;
if($currentResource->max->cpu != $cpu && !$this->instance->updateCpuSize($instance, $cpu))
if($currentResource->max->cpu != $cpu)
{
return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$instance->oldVal = $currentResource->max->cpu;
if(!$this->instance->updateCpuSize($instance, $cpu))
{
return $this->send(array('result' => 'fail', 'message' => dao::getError()));
}
}
$disk = $newInstance->disk_gb;
if(is_numeric($disk) && $disk != $diskSettings->size && $disk != $diskSettings->requestSize)
{
if($disk < $diskSettings->size || $disk > $diskSettings->limit) return $this->send(array('result' => 'fail', 'message' => $this->lang->instance->errors->invalidDiskSize));
$instance->oldVal = $diskSettings->size;
if(!$this->instance->updateVolSize($instance, $disk . 'Gi', $diskSettings->name)) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
}