Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Improve serialization for TaskResourceInfo #16700

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WIP] Improve serialization for TaskResourceInfo #16700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 42 additions & 3 deletions libs/core/src/main/java/org/opensearch/core/tasks/resourcetracker/TaskResourceInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@

import org.opensearch.common.annotation.PublicApi;
import org.opensearch.core.ParseField;
import org.opensearch.core.common.Strings;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.core.common.io.stream.Writeable;
import org.opensearch.core.xcontent.ConstructingObjectParser;
import org.opensearch.core.xcontent.MediaTypeRegistry;
import org.opensearch.core.xcontent.ToXContentObject;
import org.opensearch.core.xcontent.XContentBuilder;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Base64;
import java.util.Objects;

import static org.opensearch.core.xcontent.ConstructingObjectParser.constructorArg;
Expand Down Expand Up @@ -202,7 +202,46 @@ public void writeTo(StreamOutput out) throws IOException {

@Override
public String toString() {
return Strings.toString(MediaTypeRegistry.JSON, this);
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
try (StreamOutput streamOutput = new StreamOutput() {
@Override
public void writeByte(byte b) {
byteArrayOutputStream.write(b);
}

@Override
public void writeBytes(byte[] b, int offset, int length) {
byteArrayOutputStream.write(b, offset, length);
}

/**
* Forces any buffered output to be written.
*/
@Override
public void flush() throws IOException {
byteArrayOutputStream.flush();
}

/**
* Closes this stream to further operations.
*/
@Override
public void close() throws IOException {
byteArrayOutputStream.close();
}

@Override
public void reset() {
byteArrayOutputStream.reset();
}
}) {
// Serialize the object to the custom StreamOutput
this.writeTo(streamOutput);
// Convert the byte array to Base64 string
return Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray());
} catch (IOException e) {
return "";
}
}

@Override
Expand Down
21 changes: 8 additions & 13 deletions server/src/main/java/org/opensearch/tasks/TaskResourceTrackingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,21 @@
import org.opensearch.common.util.concurrent.ConcurrentCollections;
import org.opensearch.common.util.concurrent.ConcurrentMapLong;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.opensearch.common.xcontent.XContentHelper;
import org.opensearch.core.common.bytes.BytesArray;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.tasks.resourcetracker.ResourceStats;
import org.opensearch.core.tasks.resourcetracker.ResourceStatsType;
import org.opensearch.core.tasks.resourcetracker.ResourceUsageInfo;
import org.opensearch.core.tasks.resourcetracker.ResourceUsageMetric;
import org.opensearch.core.tasks.resourcetracker.TaskResourceInfo;
import org.opensearch.core.tasks.resourcetracker.TaskResourceUsage;
import org.opensearch.core.tasks.resourcetracker.ThreadResourceInfo;
import org.opensearch.core.xcontent.DeprecationHandler;
import org.opensearch.core.xcontent.MediaTypeRegistry;
import org.opensearch.core.xcontent.NamedXContentRegistry;
import org.opensearch.core.xcontent.XContentParser;
import org.opensearch.threadpool.RunnableTaskExecutionListener;
import org.opensearch.threadpool.ThreadPool;

import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.Base64;
import java.util.Collections;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -346,13 +342,12 @@ public TaskResourceInfo getTaskResourceUsageFromThreadContext() {
String usage = taskResourceUsages.get(0);
try {
if (usage != null && !usage.isEmpty()) {
XContentParser parser = XContentHelper.createParser(
NamedXContentRegistry.EMPTY,
DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
new BytesArray(usage),
MediaTypeRegistry.JSON
);
return TaskResourceInfo.PARSER.apply(parser, null);
// Get the serialized data as a byte array
byte[] serializedData = Base64.getDecoder().decode(usage);
// Deserialize from byte array
try (StreamInput streamInput = StreamInput.wrap(serializedData)) {
return TaskResourceInfo.readFromStream(streamInput);
}
}
} catch (IOException e) {
logger.debug("fail to parse phase resource usages: ", e);
Expand Down
Loading