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.

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

BIGTOP-4154: Support streaming shell output into task log #15

Merged
merged 1 commit into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
package org.apache.bigtop.manager.common.shell;

import org.apache.bigtop.manager.common.thread.TaskLogThreadDecorator;

import lombok.extern.slf4j.Slf4j;

import java.io.BufferedReader;
Expand Down Expand Up @@ -305,23 +307,20 @@ private BufferedReader createBufferedReader(InputStream inputStream) {
}

private Thread createReaderThread(BufferedReader reader, StringBuilder msg) {
return new Thread() {

@Override
public void run() {
try {
String line = reader.readLine();
while ((line != null) && !isInterrupted()) {
consumer.accept(line);
msg.append(line);
msg.append(System.lineSeparator());
line = reader.readLine();
}
} catch (IOException ioe) {
log.warn("Error reading the stream", ioe);
TaskLogThreadDecorator decorator = new TaskLogThreadDecorator();
return decorator.decorate(() -> {
try {
String line = reader.readLine();
while ((line != null)) {
consumer.accept(line);
msg.append(line);
msg.append(System.lineSeparator());
line = reader.readLine();
}
} catch (IOException ioe) {
log.warn("Error reading the stream", ioe);
}
};
});
}

private void scheduleTimeoutTimer() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.bigtop.manager.common.thread;

import org.apache.commons.lang3.StringUtils;

import org.slf4j.MDC;

import jakarta.annotation.Nonnull;

public class TaskLogThreadDecorator {

public Thread decorate(@Nonnull Runnable runnable) {
String taskId = MDC.get("taskId");
if (StringUtils.isNotBlank(taskId)) {
return new Thread(() -> {
try {
MDC.put("taskId", taskId);
runnable.run();
} finally {
MDC.clear();
}
});
} else {
return new Thread(runnable);
}
}
}
Loading