Skip to content

Commit 319dee6

Browse files
zinalMaksim Zinal
andauthored
fixed minor formatting issues preventing the full build (#4620)
Co-authored-by: Maksim Zinal <[email protected]>
1 parent e3a3468 commit 319dee6

File tree

4 files changed

+23
-16
lines changed

4 files changed

+23
-16
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ Thumbs.db
9797
.idea/
9898
*.iml
9999

100+
# vscode project files
101+
.vscode/
102+
100103
# maven target files
101104
target/
102105
**/target/

zeppelin-plugins/launcher/cluster/src/main/java/org/apache/zeppelin/interpreter/launcher/ClusterInterpreterLauncher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ private InterpreterClient createInterpreterProcess(InterpreterLaunchContext cont
230230

231231
// must first step start check interpreter thread
232232
ClusterInterpreterCheckThread intpCheckThread = new ClusterInterpreterCheckThread(
233-
intpProcess, context.getInterpreterGroupId(), getConnectTimeout(context));
233+
intpProcess, context.getInterpreterGroupId(), getConnectTimeout(context));
234234
intpCheckThread.start();
235235

236236
return intpProcess;

zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcess.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ public DockerInterpreterProcess(
131131
this.containerName = interpreterGroupId.toLowerCase();
132132

133133
containerSparkHome = zconf.getString(ConfVars.ZEPPELIN_DOCKER_CONTAINER_SPARK_HOME);
134-
uploadLocalLibToContainter = zconf.getBoolean(ConfVars.ZEPPELIN_DOCKER_UPLOAD_LOCAL_LIB_TO_CONTAINTER);
134+
uploadLocalLibToContainter = zconf.getBoolean(
135+
ConfVars.ZEPPELIN_DOCKER_UPLOAD_LOCAL_LIB_TO_CONTAINTER);
135136

136137
try {
137138
this.zeppelinHome = getZeppelinHome();

zeppelin-plugins/launcher/docker/src/test/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcessTest.java

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,27 +62,30 @@ void testCreateIntpProcess() throws IOException {
6262

6363
@Test
6464
void testEnv() throws IOException {
65-
when(zconf.getString(ConfVars.ZEPPELIN_DOCKER_CONTAINER_SPARK_HOME)).thenReturn("my-spark-home");
66-
when(zconf.getBoolean(ConfVars.ZEPPELIN_DOCKER_UPLOAD_LOCAL_LIB_TO_CONTAINTER)).thenReturn(false);
67-
when(zconf.getString(ConfVars.ZEPPELIN_DOCKER_HOST)).thenReturn("http://my-docker-host:2375");
65+
when(zconf.getString(ConfVars.ZEPPELIN_DOCKER_CONTAINER_SPARK_HOME))
66+
.thenReturn("my-spark-home");
67+
when(zconf.getBoolean(ConfVars.ZEPPELIN_DOCKER_UPLOAD_LOCAL_LIB_TO_CONTAINTER))
68+
.thenReturn(false);
69+
when(zconf.getString(ConfVars.ZEPPELIN_DOCKER_HOST))
70+
.thenReturn("http://my-docker-host:2375");
6871

6972
Properties properties = new Properties();
7073
properties.setProperty(
71-
ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETER_CONNECT_TIMEOUT.getVarName(), "5000");
74+
ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETER_CONNECT_TIMEOUT.getVarName(), "5000");
7275
HashMap<String, String> envs = new HashMap<String, String>();
7376
envs.put("MY_ENV1", "V1");
7477

7578
DockerInterpreterProcess intp = spy(new DockerInterpreterProcess(
76-
zconf,
77-
"interpreter-container:1.0",
78-
"shared_process",
79-
"sh",
80-
"shell",
81-
properties,
82-
envs,
83-
"zeppelin.server.hostname",
84-
12320,
85-
5000, 10));
79+
zconf,
80+
"interpreter-container:1.0",
81+
"shared_process",
82+
"sh",
83+
"shell",
84+
properties,
85+
envs,
86+
"zeppelin.server.hostname",
87+
12320,
88+
5000, 10));
8689

8790
assertEquals("my-spark-home", intp.containerSparkHome);
8891
assertFalse(intp.uploadLocalLibToContainter);

0 commit comments

Comments
 (0)