apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7219: Fix NPE, log warning when config item is missing from scope

Browse Source 
- Cherry picked from Daan's fix 63fbd16dd11388bd93cdbec4ea7fe6de37aa7fc5
- Added another check if configDepot returned null
- Removed developer prefill values

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 188924751ed87a01541a094e03e958cd8d01653b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2014-10-02 11:58:20 +02:00
parent 3fddfe0e10
commit 71a0148565
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
developer/developer-prefill.sql
View File

@ -62,22 +62,6 @@ INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
VALUES ('Advanced', 'DEFAULT', 'management-server', VALUES ('Advanced', 'DEFAULT', 'management-server',
'expunge.interval', '60'); 'expunge.interval', '60');
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
VALUES ('Advanced', 'DEFAULT', 'management-server',
'cluster.cpu.allocated.capacity.disablethreshold', '0.95');
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
VALUES ('Advanced', 'DEFAULT', 'management-server',
'cluster.memory.allocated.capacity.disablethreshold ', '0.95');
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
VALUES ('Advanced', 'DEFAULT', 'management-server',
'pool.storage.allocated.capacity.disablethreshold ', '0.95');
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
VALUES ('Advanced', 'DEFAULT', 'management-server',
'pool.storage.capacity.disablethreshold ', '0.95');
-- Add developer configuration entry; allows management server to be run as a user other than "cloud" -- Add developer configuration entry; allows management server to be run as a user other than "cloud"
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value) INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
VALUES ('Advanced', 'DEFAULT', 'management-server', VALUES ('Advanced', 'DEFAULT', 'management-server',

15
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -1709,9 +1709,18 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
List<ConfigurationVO> configVOList = new ArrayList<ConfigurationVO>(); List<ConfigurationVO> configVOList = new ArrayList<ConfigurationVO>();
for (ConfigurationVO param : result.first()) { for (ConfigurationVO param : result.first()) {
ConfigurationVO configVo = _configDao.findByName(param.getName()); ConfigurationVO configVo = _configDao.findByName(param.getName());
configVo.setValue(_configDepot.get(param.getName()).valueIn(id).toString()); if (configVo != null) {
configVOList.add(configVo); ConfigKey<?> key = _configDepot.get(param.getName());
} if (key != null) {
configVo.setValue(key.valueIn(id).toString());
configVOList.add(configVo);
} else {
s_logger.warn("ConfigDepot could not find parameter " + param.getName() + " for scope " + scope);
}
} else {
s_logger.warn("Configuration item " + param.getName() + " not found in " + scope);
}
}
return new Pair<List<? extends Configuration>, Integer>(configVOList, configVOList.size()); return new Pair<List<? extends Configuration>, Integer>(configVOList, configVOList.size());
} }