Skip to content

Commit 25009bf

Browse files
yadvryadvr
committed
Merge remote-tracking branch 'origin/4.19'
2 parents 8ea9fc9 + 94c8b1d commit 25009bf

File tree

21 files changed

+470
-73
lines changed

21 files changed

+470
-73
lines changed

‎api/src/main/java/com/cloud/event/EventTypes.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@ public class EventTypes {
400400
public static final String EVENT_IMAGE_STORE_DATA_MIGRATE = "IMAGE.STORE.MIGRATE.DATA";
401401
public static final String EVENT_IMAGE_STORE_RESOURCES_MIGRATE = "IMAGE.STORE.MIGRATE.RESOURCES";
402402
public static final String EVENT_IMAGE_STORE_OBJECT_DOWNLOAD = "IMAGE.STORE.OBJECT.DOWNLOAD";
403+
public static final String EVENT_UPDATE_IMAGE_STORE_ACCESS_STATE = "IMAGE.STORE.ACCESS.UPDATED";
403404

404405
// Configuration Table
405406
public static final String EVENT_CONFIGURATION_VALUE_EDIT = "CONFIGURATION.VALUE.EDIT";
@@ -1164,6 +1165,7 @@ public class EventTypes {
11641165

11651166
entityEventDetails.put(EVENT_IMAGE_STORE_DATA_MIGRATE, ImageStore.class);
11661167
entityEventDetails.put(EVENT_IMAGE_STORE_OBJECT_DOWNLOAD, ImageStore.class);
1168+
entityEventDetails.put(EVENT_UPDATE_IMAGE_STORE_ACCESS_STATE, ImageStore.class);
11671169
entityEventDetails.put(EVENT_LIVE_PATCH_SYSTEMVM, "SystemVMs");
11681170

11691171
//Object Store

‎api/src/main/java/org/apache/cloudstack/alert/AlertService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private AlertType(short type, String name, boolean isDefault) {
5252
public static final AlertType ALERT_TYPE_ROUTING = new AlertType((short)11, "ALERT.NETWORK.ROUTING", true);
5353
public static final AlertType ALERT_TYPE_STORAGE_MISC = new AlertType((short)12, "ALERT.STORAGE.MISC", true);
5454
public static final AlertType ALERT_TYPE_USAGE_SERVER = new AlertType((short)13, "ALERT.USAGE", true);
55-
public static final AlertType ALERT_TYPE_MANAGMENT_NODE = new AlertType((short)14, "ALERT.MANAGEMENT", true);
55+
public static final AlertType ALERT_TYPE_MANAGEMENT_NODE = new AlertType((short)14, "ALERT.MANAGEMENT", true);
5656
public static final AlertType ALERT_TYPE_DOMAIN_ROUTER_MIGRATE = new AlertType((short)15, "ALERT.NETWORK.DOMAINROUTERMIGRATE", true);
5757
public static final AlertType ALERT_TYPE_CONSOLE_PROXY_MIGRATE = new AlertType((short)16, "ALERT.SERVICE.CONSOLEPROXYMIGRATE", true);
5858
public static final AlertType ALERT_TYPE_USERVM_MIGRATE = new AlertType((short)17, "ALERT.USERVM.MIGRATE", true);

‎api/src/main/java/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import com.google.common.base.Preconditions;
4040

4141
@APICommand(name = "moveUser",
42-
description = "Moves a user to another account",
42+
description = "Moves a user to another account in the same domain.",
4343
responseObject = SuccessResponse.class,
4444
requestHasSensitiveInfo = false,
4545
responseHasSensitiveInfo = false,
@@ -56,18 +56,18 @@ public class MoveUserCmd extends BaseCmd {
5656
type = CommandType.UUID,
5757
entityType = UserResponse.class,
5858
required = true,
59-
description = "id of the user to be deleted")
59+
description = "id of the user to be moved.")
6060
private Long id;
6161

6262
@Parameter(name = ApiConstants.ACCOUNT,
6363
type = CommandType.STRING,
64-
description = "Creates the user under the specified account. If no account is specified, the username will be used as the account name.")
64+
description = "Moves the user under the specified account. If no account name is specified, it is necessary to provide an account id.")
6565
private String accountName;
6666

6767
@Parameter(name = ApiConstants.ACCOUNT_ID,
6868
type = CommandType.UUID,
6969
entityType = AccountResponse.class,
70-
description = "Creates the user under the specified domain. Has to be accompanied with the account parameter")
70+
description = "Moves the user under the specified account. If no account id is specified, it is necessary to provide an account name.")
7171
private Long accountId;
7272

7373
@Inject

‎engine/components-api/src/main/java/com/cloud/vm/VmWork.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,21 @@
1717
package com.cloud.vm;
1818

1919
import java.io.Serializable;
20+
import java.util.HashMap;
21+
import java.util.List;
22+
import java.util.Map;
23+
24+
import org.apache.commons.collections.CollectionUtils;
25+
import org.apache.commons.lang3.StringUtils;
26+
27+
import com.cloud.serializer.GsonHelper;
28+
import com.fasterxml.jackson.core.JsonProcessingException;
29+
import com.fasterxml.jackson.databind.ObjectMapper;
30+
import com.google.gson.Gson;
2031

2132
public class VmWork implements Serializable {
2233
private static final long serialVersionUID = -6946320465729853589L;
34+
private static final Gson gsonLogger = GsonHelper.getGsonLogger();
2335

2436
long userId;
2537
long accountId;
@@ -56,4 +68,31 @@ public long getVmId() {
5668
public String getHandlerName() {
5769
return handlerName;
5870
}
71+
72+
@Override
73+
public String toString() {
74+
return gsonLogger.toJson(this);
75+
}
76+
77+
protected String toStringAfterRemoveParams(String paramsObjName, List<String> params) {
78+
String ObjJsonStr = gsonLogger.toJson(this);
79+
if (StringUtils.isBlank(ObjJsonStr) || StringUtils.isBlank(paramsObjName) || CollectionUtils.isEmpty(params)) {
80+
return ObjJsonStr;
81+
}
82+
83+
try {
84+
Map<String, Object> ObjMap = new ObjectMapper().readValue(ObjJsonStr, HashMap.class);
85+
if (ObjMap != null && ObjMap.containsKey(paramsObjName)) {
86+
for (String param : params) {
87+
((Map<String, String>)ObjMap.get(paramsObjName)).remove(param);
88+
}
89+
String resultJson = new ObjectMapper().writeValueAsString(ObjMap);
90+
return resultJson;
91+
}
92+
} catch (final JsonProcessingException e) {
93+
// Ignore json exception
94+
}
95+
96+
return ObjJsonStr;
97+
}
5998
}

‎engine/components-api/src/main/java/com/cloud/vm/VmWorkJobHandlerProxy.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@
2121
import java.util.HashMap;
2222
import java.util.Map;
2323

24-
import org.apache.log4j.Logger;
25-
26-
import com.google.gson.Gson;
27-
2824
import org.apache.cloudstack.framework.jobs.impl.JobSerializerHelper;
2925
import org.apache.cloudstack.jobs.JobInfo;
26+
import org.apache.log4j.Logger;
3027

3128
import com.cloud.serializer.GsonHelper;
3229
import com.cloud.utils.Pair;
30+
import com.google.gson.Gson;
3331

3432
/**
3533
* VmWorkJobHandlerProxy can not be used as standalone due to run-time
@@ -102,12 +100,12 @@ public Pair<JobInfo.Status, String> handleVmWorkJob(VmWork work) throws Exceptio
102100

103101
try {
104102
if (s_logger.isDebugEnabled())
105-
s_logger.debug("Execute VM work job: " + work.getClass().getName() + _gsonLogger.toJson(work));
103+
s_logger.debug("Execute VM work job: " + work.getClass().getName() + work);
106104

107105
Object obj = method.invoke(_target, work);
108106

109107
if (s_logger.isDebugEnabled())
110-
s_logger.debug("Done executing VM work job: " + work.getClass().getName() + _gsonLogger.toJson(work));
108+
s_logger.debug("Done executing VM work job: " + work.getClass().getName() + work);
111109

112110
assert (obj instanceof Pair);
113111
return (Pair<JobInfo.Status, String>)obj;

‎engine/orchestration/src/main/java/com/cloud/vm/VmWorkReboot.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
package com.cloud.vm;
1818

1919
import java.io.Serializable;
20+
import java.util.ArrayList;
2021
import java.util.HashMap;
22+
import java.util.List;
2123
import java.util.Map;
2224

2325
import org.apache.cloudstack.framework.jobs.impl.JobSerializerHelper;
@@ -62,4 +64,11 @@ public void setParams(Map<VirtualMachineProfile.Param, Object> params) {
6264
}
6365
}
6466
}
67+
68+
@Override
69+
public String toString() {
70+
List<String> params = new ArrayList<>();
71+
params.add(VirtualMachineProfile.Param.VmPassword.getName());
72+
return super.toStringAfterRemoveParams("rawParams", params);
73+
}
6574
}

‎engine/orchestration/src/main/java/com/cloud/vm/VmWorkStart.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
package com.cloud.vm;
1919

2020
import java.io.Serializable;
21+
import java.util.ArrayList;
2122
import java.util.HashMap;
23+
import java.util.List;
2224
import java.util.Map;
2325

2426
import org.apache.cloudstack.context.CallContext;
@@ -135,4 +137,11 @@ public void setParams(Map<VirtualMachineProfile.Param, Object> params) {
135137
}
136138
}
137139
}
140+
141+
@Override
142+
public String toString() {
143+
List<String> params = new ArrayList<>();
144+
params.add(VirtualMachineProfile.Param.VmPassword.getName());
145+
return super.toStringAfterRemoveParams("rawParams", params);
146+
}
138147
}

‎engine/orchestration/src/test/java/com/cloud/vm/VmWorkRebootTest.java‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package com.cloud.vm;
18+
19+
import java.util.HashMap;
20+
import java.util.Map;
21+
22+
import org.apache.cloudstack.framework.jobs.impl.JobSerializerHelper;
23+
import org.junit.Assert;
24+
import org.junit.Test;
25+
26+
public class VmWorkRebootTest {
27+
28+
@Test
29+
public void testToString() {
30+
VmWork vmWork = new VmWork(1l, 1l, 1l, "testhandler");
31+
Map<VirtualMachineProfile.Param, Object> params = new HashMap<>();
32+
String lastHost = "rO0ABXQABHRydWU";
33+
String lastHostSerialized = JobSerializerHelper.toObjectSerializedString(lastHost);
34+
params.put(VirtualMachineProfile.Param.ConsiderLastHost, lastHost);
35+
params.put(VirtualMachineProfile.Param.VmPassword, "rO0ABXQADnNhdmVkX3Bhc3N3b3Jk");
36+
VmWorkReboot workInfo = new VmWorkReboot(vmWork, params);
37+
String expectedVmWorkRebootStr = "{\"accountId\":1,\"vmId\":1,\"handlerName\":\"testhandler\",\"userId\":1,\"rawParams\":{\"ConsiderLastHost\":\"" + lastHostSerialized + "\"}}";
38+
39+
String vmWorkRebootStr = workInfo.toString();
40+
Assert.assertEquals(expectedVmWorkRebootStr, vmWorkRebootStr);
41+
}
42+
}

‎engine/orchestration/src/test/java/com/cloud/vm/VmWorkStartTest.java‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package com.cloud.vm;
18+
19+
import java.util.HashMap;
20+
import java.util.Map;
21+
22+
import org.apache.cloudstack.framework.jobs.impl.JobSerializerHelper;
23+
import org.junit.Assert;
24+
import org.junit.Test;
25+
26+
public class VmWorkStartTest {
27+
28+
@Test
29+
public void testToStringWithParams() {
30+
VmWork vmWork = new VmWork(1l, 1l, 1l, "testhandler");
31+
VmWorkStart workInfo = new VmWorkStart(vmWork);
32+
Map<VirtualMachineProfile.Param, Object> params = new HashMap<>();
33+
String lastHost = "rO0ABXQABHRydWU";
34+
String lastHostSerialized = JobSerializerHelper.toObjectSerializedString(lastHost);
35+
params.put(VirtualMachineProfile.Param.ConsiderLastHost, lastHost);
36+
params.put(VirtualMachineProfile.Param.VmPassword, "rO0ABXQADnNhdmVkX3Bhc3N3b3Jk");
37+
workInfo.setParams(params);
38+
String expectedVmWorkStartStr = "{\"accountId\":1,\"dcId\":0,\"vmId\":1,\"handlerName\":\"testhandler\",\"userId\":1,\"rawParams\":{\"ConsiderLastHost\":\"" + lastHostSerialized + "\"}}";
39+
40+
String vmWorkStartStr = workInfo.toString();
41+
Assert.assertEquals(expectedVmWorkStartStr, vmWorkStartStr);
42+
}
43+
44+
@Test
45+
public void testToStringWithRawParams() {
46+
VmWork vmWork = new VmWork(1l, 1l, 1l, "testhandler");
47+
VmWorkStart workInfo = new VmWorkStart(vmWork);
48+
Map<String, String> rawParams = new HashMap<>();
49+
rawParams.put(VirtualMachineProfile.Param.ConsiderLastHost.getName(), "rO0ABXQABHRydWU");
50+
rawParams.put(VirtualMachineProfile.Param.VmPassword.getName(), "rO0ABXQADnNhdmVkX3Bhc3N3b3Jk");
51+
workInfo.setRawParams(rawParams);
52+
String expectedVmWorkStartStr = "{\"accountId\":1,\"dcId\":0,\"vmId\":1,\"handlerName\":\"testhandler\",\"userId\":1,\"rawParams\":{\"ConsiderLastHost\":\"rO0ABXQABHRydWU\"}}";
53+
54+
String vmWorkStartStr = workInfo.toString();
55+
Assert.assertEquals(expectedVmWorkStartStr, vmWorkStartStr);
56+
}
57+
}

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
import org.libvirt.DomainInfo.DomainState;
8686
import org.libvirt.DomainInterfaceStats;
8787
import org.libvirt.DomainSnapshot;
88-
import org.libvirt.Library;
8988
import org.libvirt.LibvirtException;
9089
import org.libvirt.MemoryStatistic;
9190
import org.libvirt.Network;
@@ -3694,20 +3693,7 @@ private StartupStorageCommand createLocalStoragePool(String localStoragePath, St
36943693
}
36953694

36963695
private void setupLibvirtEventListener() {
3697-
final Thread libvirtListenerThread = new Thread(() -> {
3698-
try {
3699-
Library.runEventLoop();
3700-
} catch (LibvirtException e) {
3701-
s_logger.error("LibvirtException was thrown in event loop: ", e);
3702-
} catch (InterruptedException e) {
3703-
s_logger.error("Libvirt event loop was interrupted: ", e);
3704-
}
3705-
});
3706-
37073696
try {
3708-
libvirtListenerThread.setDaemon(true);
3709-
libvirtListenerThread.start();
3710-
37113697
Connect conn = LibvirtConnection.getConnection();
37123698
conn.addLifecycleListener(this::onDomainLifecycleChange);
37133699

@@ -3727,7 +3713,7 @@ private int onDomainLifecycleChange(Domain domain, DomainEvent domainEvent) {
37273713
* Checking for this helps us differentiate between events where cloudstack or admin stopped the VM vs guest
37283714
* initiated, and avoid pushing extra updates for actions we are initiating without a need for extra tracking */
37293715
DomainEventDetail detail = domainEvent.getDetail();
3730-
if (StoppedDetail.SHUTDOWN.equals(detail) || StoppedDetail.CRASHED.equals(detail)) {
3716+
if (StoppedDetail.SHUTDOWN.equals(detail) || StoppedDetail.CRASHED.equals(detail) || StoppedDetail.FAILED.equals(detail)) {
37313717
s_logger.info("Triggering out of band status update due to completed self-shutdown or crash of VM");
37323718
_agentStatusUpdater.triggerUpdate();
37333719
} else {

0 commit comments

Comments
 (0)