etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

server: Updated the event message with proper json format for cmd info and job result. (#5453)

This commit is contained in:
sureshanaparti 2021-09-17 10:31:48 +05:30 committed by GitHub
parent f0eac35e3d
commit 191424431d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/src/main/java/com/cloud/api/ApiSerializerHelper.java
View File

@ -16,8 +16,13 @@
// under the License.
package com.cloud.api;
import java.util.HashMap;
import java.util.Map;
import org.apache.log4j.Logger;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import org.apache.cloudstack.api.ResponseObject;
@ -43,7 +48,6 @@ public class ApiSerializerHelper {
public static Object fromSerializedString(String result) {
try {
if (result != null && !result.isEmpty()) {
String[] serializedParts = result.split(token);
if (serializedParts.length < 2) {
@ -80,4 +84,26 @@ public class ApiSerializerHelper {
throw e;
}
}
public static Map<String, Object> fromSerializedStringToMap(String result) {
Map<String,Object> objParams = null;
try {
Object obj = fromSerializedString(result);
if (obj != null) {
Gson gson = ApiGsonHelper.getBuilder().create();
String objJson = gson.toJson(obj);
objParams = new ObjectMapper().readValue(objJson, HashMap.class);
objParams.put("class", obj.getClass().getName());
String nameField = ((ResponseObject)obj).getObjectName();
if (nameField != null) {
objParams.put("object", nameField);
}
}
} catch (RuntimeException | JsonProcessingException e) {
s_logger.error("Caught runtime exception when doing GSON deserialization to map on: " + result, e);
}
return objParams;
}
}

16
server/src/main/java/com/cloud/api/ApiServer.java
View File

@ -317,9 +317,11 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
// Get the event type from the cmdInfo json string
String info = job.getCmdInfo();
String cmdEventType = "unknown";
Map<String, Object> cmdInfoObj = new HashMap<String, Object>();
if (info != null) {
Type type = new TypeToken<Map<String, String>>(){}.getType();
Map<String, String> cmdInfo = ApiGsonHelper.getBuilder().create().fromJson(info, type);
cmdInfoObj.putAll(cmdInfo);
String eventTypeObj = cmdInfo.get("cmdEventType");
if (eventTypeObj != null) {
cmdEventType = eventTypeObj;
@ -330,6 +332,12 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
if (s_logger.isDebugEnabled())
s_logger.debug("Unable to locate cmdEventType marker in job info. publish as unknown event");
}
String contextDetails = cmdInfo.get("ctxDetails");
if(contextDetails != null) {
Type objectMapType = new TypeToken<Map<Object, Object>>() {}.getType();
Map<Object, Object> ctxDetails = ApiGsonHelper.getBuilder().create().fromJson(contextDetails, objectMapType);
cmdInfoObj.put("ctxDetails", ctxDetails);
}
}
// For some reason, the instanceType / instanceId are not abstract, which means we may get null values.
String instanceType = job.getInstanceType() != null ? job.getInstanceType() : "unknown";
@ -337,7 +345,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
org.apache.cloudstack.framework.events.Event event = new org.apache.cloudstack.framework.events.Event("management-server", EventCategory.ASYNC_JOB_CHANGE_EVENT.getName(),
jobEvent, instanceType, instanceUuid);
Map<String, String> eventDescription = new HashMap<String, String>();
Map<String, Object> eventDescription = new HashMap<String, Object>();
eventDescription.put("command", job.getCmd());
eventDescription.put("user", userJobOwner.getUuid());
eventDescription.put("account", jobOwner.getUuid());
@ -347,9 +355,9 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
eventDescription.put("instanceType", instanceType);
eventDescription.put("commandEventType", cmdEventType);
eventDescription.put("jobId", job.getUuid());
eventDescription.put("jobResult", job.getResult());
eventDescription.put("cmdInfo", job.getCmdInfo());
eventDescription.put("status", "" + job.getStatus() );
eventDescription.put("jobResult", ApiSerializerHelper.fromSerializedStringToMap(job.getResult()));
eventDescription.put("cmdInfo", cmdInfoObj);
eventDescription.put("status", "" + job.getStatus());
// If the event.accountinfo boolean value is set, get the human readable value for the username / domainname
if (UseEventAccountInfo.value()) {
DomainVO domain = domainDao.findById(jobOwner.getDomainId());