Skip to content

Commit f355359

Browse files
ngtunangtuna
committed
fix issues
1 parent 0b0e262 commit f355359

4 files changed

Lines changed: 33 additions & 30 deletions

File tree

‎engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public List<AutoScaleVmGroupVmMapVO> listByGroup(long vmGroupId) {
3333
public int remove(long vmGroupId, long vmId) {
3434
SearchCriteria<AutoScaleVmGroupVmMapVO> sc = createSearchCriteria();
3535
sc.addAnd("vmGroupId", SearchCriteria.Op.EQ, vmGroupId);
36-
sc.addAnd("vmId", SearchCriteria.Op.EQ, vmId);
36+
sc.addAnd("instanceId", SearchCriteria.Op.EQ, vmId);
3737
return remove(sc);
3838
}
3939

‎scripts/vm/hypervisor/xenserver/perfmon.py‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -186,16 +186,10 @@ def getuuid(vm_name):
186186
return output
187187

188188
def get_vm_group_perfmon(args={}):
189-
#Release code
190189
login = XenAPI.xapi_local()
191190
login.login_with_password("","")
192-
average_cpu = 0
193-
average_memory = 0
194191
result = ""
195192

196-
#test code
197-
#login = XenAPI.Session(url)
198-
#login.login_with_password(username, password)
199193
total_vm = int(args['total_vm'])
200194
total_counter = int(args['total_counter'])
201195
now = int(time.time()) / 60
@@ -222,18 +216,19 @@ def get_vm_group_perfmon(args={}):
222216
vm_uuid = getuuid(vm_name)
223217
#print "Got values for VM: " + str(vm_count) + " " + vm_uuid
224218
for counter_count in xrange(1, total_counter + 1):
219+
#refresh average
220+
average_cpu = 0
221+
average_memory = 0
225222
counter = args['counter' + str(counter_count)]
226223
total_row = rrd_updates.get_nrows()
227224
duration = int(args['duration' + str(counter_count)]) / 60
228225
duration_diff = total_row - duration
229-
#print "param: " + counter
230226
if counter == "cpu":
231227
total_cpu = rrd_updates.get_total_cpu_core(vm_uuid)
232228
for row in xrange(duration_diff, total_row):
233229
for cpu in xrange(0, total_cpu):
234230
average_cpu += rrd_updates.get_vm_data(vm_uuid, "cpu" + str(cpu), row)
235231
average_cpu /= (duration * total_cpu)
236-
#print "Average CPU: " + str(average_cpu)
237232
if result == "":
238233
result += str(vm_count) + '.' + str(counter_count) + ':' + str(average_cpu)
239234
else:
@@ -242,7 +237,6 @@ def get_vm_group_perfmon(args={}):
242237
for row in xrange(duration_diff, total_row):
243238
average_memory += rrd_updates.get_vm_data(vm_uuid, "memory_target", row) / 1048576 - rrd_updates.get_vm_data(vm_uuid, "memory_internal_free", row) / 1024
244239
average_memory /= duration
245-
#print "Average Memory: " + str(average_memory)
246240
if result == "":
247241
result += str(vm_count) + '.' + str(counter_count) + ':' + str(average_memory)
248242
else:

‎server/src/com/cloud/network/as/AutoScaleManagerImpl.java‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.HashMap;
2424
import java.util.List;
2525
import java.util.Map;
26+
import java.util.concurrent.Executors;
2627
import java.util.concurrent.ScheduledExecutorService;
2728
import java.util.concurrent.TimeUnit;
2829

@@ -123,7 +124,7 @@
123124
@Local(value = {AutoScaleService.class, AutoScaleManager.class})
124125
public class AutoScaleManagerImpl<Type> extends ManagerBase implements AutoScaleManager, AutoScaleService {
125126
private static final Logger s_logger = Logger.getLogger(AutoScaleManagerImpl.class);
126-
private ScheduledExecutorService _executor = null;
127+
private ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1);
127128

128129
@Inject
129130
EntityManager _entityMgr;
@@ -1423,6 +1424,20 @@ public void doScaleDown(final long groupId) {
14231424
final long vmId = removeLBrule(asGroup);
14241425
if (vmId != -1) {
14251426
long profileId = asGroup.getProfileId();
1427+
1428+
// update group-vm mapping
1429+
_autoScaleVmGroupVmMapDao.remove(groupId, vmId);
1430+
// update last_quiettime
1431+
List<AutoScaleVmGroupPolicyMapVO> GroupPolicyVOs = _autoScaleVmGroupPolicyMapDao.listByVmGroupId(groupId);
1432+
for (AutoScaleVmGroupPolicyMapVO GroupPolicyVO : GroupPolicyVOs) {
1433+
AutoScalePolicyVO vo = _autoScalePolicyDao.findById(GroupPolicyVO.getPolicyId());
1434+
if (vo.getAction().equals("scaledown")) {
1435+
vo.setLastQuiteTime(new Date());
1436+
_autoScalePolicyDao.persist(vo);
1437+
break;
1438+
}
1439+
}
1440+
14261441
// get destroyvmgrace param
14271442
AutoScaleVmProfileVO asProfile = _autoScaleVmProfileDao.findById(profileId);
14281443
Integer destroyVmGracePeriod = asProfile.getDestroyVmGraceperiod();
@@ -1431,21 +1446,9 @@ public void doScaleDown(final long groupId) {
14311446
@Override
14321447
public void run() {
14331448
try {
1434-
// destroy vm
1449+
14351450
_userVmManager.destroyVm(vmId);
1436-
// update group-vm mapping
1437-
_autoScaleVmGroupVmMapDao.remove(groupId, vmId);
1438-
// update last_quiettime
1439-
List<AutoScaleVmGroupPolicyMapVO> GroupPolicyVOs = _autoScaleVmGroupPolicyMapDao
1440-
.listByVmGroupId(groupId);
1441-
for (AutoScaleVmGroupPolicyMapVO GroupPolicyVO : GroupPolicyVOs) {
1442-
AutoScalePolicyVO vo = _autoScalePolicyDao
1443-
.findById(GroupPolicyVO.getPolicyId());
1444-
if (vo.getAction().equals("scaledown")) {
1445-
vo.setLastQuiteTime(new Date());
1446-
break;
1447-
}
1448-
}
1451+
14491452
} catch (ResourceUnavailableException e) {
14501453
e.printStackTrace();
14511454
} catch (ConcurrentOperationException e) {

‎server/src/com/cloud/vm/UserVmManagerImpl.java‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@
8686
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
8787
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
8888
import org.apache.cloudstack.storage.to.TemplateObjectTO;
89+
import org.apache.commons.codec.binary.Base64;
90+
import org.apache.log4j.Logger;
8991

9092
import com.cloud.agent.AgentManager;
9193
import com.cloud.agent.api.Answer;
@@ -3362,9 +3364,12 @@ public String generateRandomPassword() {
33623364
}
33633365

33643366
@Override
3365-
public UserVm destroyVm(long vmId) throws ResourceUnavailableException, ConcurrentOperationException {
3366-
Account caller = CallContext.current().getCallingAccount();
3367-
Long userId = CallContext.current().getCallingUserId();
3367+
3368+
public UserVm destroyVm(long vmId) throws ResourceUnavailableException,
3369+
ConcurrentOperationException {
3370+
// Account caller = CallContext.current().getCallingAccount();
3371+
// Long userId = CallContext.current().getCallingUserId();
3372+
Long userId = 2L;
33683373

33693374
// Verify input parameters
33703375
UserVmVO vm = _vmDao.findById(vmId);
@@ -3378,8 +3383,9 @@ public UserVm destroyVm(long vmId) throws ResourceUnavailableException, Concurre
33783383
return vm;
33793384
}
33803385

3381-
_accountMgr.checkAccess(caller, null, true, vm);
3382-
_userDao.findById(userId);
3386+
3387+
// _accountMgr.checkAccess(caller, null, true, vm);
3388+
User userCaller = _userDao.findById(userId);
33833389

33843390
boolean status;
33853391
State vmState = vm.getState();

0 commit comments

Comments
 (0)