Skip to content
Open
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
@@ -0,0 +1,96 @@
/*
* 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
*
* http://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.zeppelin.interpreter;

import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcess;

/**
* Point-in-time status snapshot of a single interpreter process as seen by the Zeppelin server.
* Built purely from in-memory server state without contacting the process, so {@code started}
* reflects whether a process handle exists, not whether the process is currently reachable.
* Reachability is intentionally out of scope here to keep the read path non-blocking.
*/
public class InterpreterProcessStatus {
private final String settingId;
private final String settingName;
private final String groupId;
private final int numSessions;
private final boolean started;
private String host;
private int port = -1;
private String startTime;
private long uptimeSeconds;
private String errorMessage;

public InterpreterProcessStatus(ManagedInterpreterGroup group) {
InterpreterSetting setting = group.getInterpreterSetting();
this.settingId = setting.getId();
this.settingName = setting.getName();
this.groupId = group.getId();
this.numSessions = group.getSessionNum();
RemoteInterpreterProcess process = group.getInterpreterProcess();
this.started = process != null;
if (started) {
this.host = process.getHost();
this.port = process.getPort();
this.startTime = process.getStartTime();
this.uptimeSeconds = (System.currentTimeMillis() - process.getStartTimeMs()) / 1000;
this.errorMessage = process.getErrorMessage();
}
}

public String getSettingId() {
return settingId;
}

public String getSettingName() {
return settingName;
}

public String getGroupId() {
return groupId;
}

public int getNumSessions() {
return numSessions;
}

public boolean isStarted() {
return started;
}

public String getHost() {
return host;
}

public int getPort() {
return port;
}

public String getStartTime() {
return startTime;
}

public long getUptimeSeconds() {
return uptimeSeconds;
}

public String getErrorMessage() {
return errorMessage;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,17 @@ public List<ManagedInterpreterGroup> getAllInterpreterGroup() {
return interpreterGroups;
}

/**
* Snapshot the status of every running interpreter group. Uses in-memory state only
*/
public List<InterpreterProcessStatus> getInterpreterProcessStatuses() {
List<InterpreterProcessStatus> statuses = new ArrayList<>();
for (ManagedInterpreterGroup group : getAllInterpreterGroup()) {
statuses.add(new InterpreterProcessStatus(group));
}
return statuses;
}

// TODO(zjffdu) Current approach is not optimized. we have to iterate all interpreter settings.
public void removeInterpreterGroup(String intpGroupId) {
for (InterpreterSetting interpreterSetting : interpreterSettings.values()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public abstract class RemoteInterpreterProcess implements InterpreterClient, Aut
protected int intpEventServerPort;
private PooledRemoteClient<Client> remoteClient;
private String startTime;
private final long startTimeMs;

public RemoteInterpreterProcess(int connectTimeout,
int connectionPoolSize,
Expand All @@ -52,6 +53,7 @@ public RemoteInterpreterProcess(int connectTimeout,
this.intpEventServerHost = intpEventServerHost;
this.intpEventServerPort = intpEventServerPort;
this.startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
this.startTimeMs = System.currentTimeMillis();
this.remoteClient = new PooledRemoteClient<>(() -> {
TSocket transport = new TSocket(getHost(), getPort());
try {
Expand All @@ -71,6 +73,10 @@ public int getConnectTimeout() {
public String getStartTime() {
return startTime;
}

public long getStartTimeMs() {
return startTimeMs;
}

@Override
public void close() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,17 @@ public Response listSettings() {
return new JsonResponse<>(Status.OK, "", interpreterSettingManager.get()).build();
}

/**
* List the runtime status of all running interpreter processes.
*/
@GET
@Path("status")
@ZeppelinApi
public Response getInterpreterProcessStatus() {
return new JsonResponse<>(Status.OK, "",
interpreterSettingManager.getInterpreterProcessStatuses()).build();
}

/**
* Get a setting.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
import java.util.Map;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.mock;
Expand Down Expand Up @@ -262,6 +264,28 @@ void testRestartShared() throws InterpreterException {
assertEquals(0, interpreterSetting.getAllInterpreterGroups().size());
}

@Test
void testGetInterpreterProcessStatuses() throws InterpreterException {
// no interpreter group has been created yet
assertTrue(interpreterSettingManager.getInterpreterProcessStatuses().isEmpty());

InterpreterSetting interpreterSetting = interpreterSettingManager.getByName("test");
interpreterSetting.getOption().setPerUser("shared");
interpreterSetting.getOption().setPerNote("shared");
interpreterSetting.getOrCreateSession("user1", note1Id);

List<InterpreterProcessStatus> statuses =
interpreterSettingManager.getInterpreterProcessStatuses();
assertEquals(1, statuses.size());
InterpreterProcessStatus status = statuses.get(0);
assertEquals("test", status.getSettingName());
assertEquals(1, status.getNumSessions());
// process starts lazily on first interpret, so it is not started at this point
assertFalse(status.isStarted());
assertNull(status.getHost());
assertEquals(-1, status.getPort());
}

@Test
void testRestartPerUserIsolated() throws InterpreterException {
InterpreterSetting interpreterSetting = interpreterSettingManager.getByName("test");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,17 @@ void getSettings() throws IOException {
get.close();
}

@Test
void testGetInterpreterProcessStatus() throws IOException {
// when
CloseableHttpResponse get = httpGet("/interpreter/status");
// then
assertThat(get, isAllowed());
JsonArray body = getArrayBodyFieldFromResponse(EntityUtils.toString(get.getEntity(), StandardCharsets.UTF_8));
assertNotNull(body);
get.close();
}

@Test
void testGetNonExistInterpreterSetting() throws IOException {
// when
Expand Down
Loading