kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-10 04:15:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

drivers/java: restore 0.8.7 java version detection (#5317)

Browse Source 
Restore 0.8.x behavior where java driver is marked as detected when
`java -version` exits with 0 but returns unexpected output.

Furthermore, we restore behavior when `java -version` where we parse the
first three lines of `java -version` but ignore rest.

If `java -version` returns less than 3 lines, Nomad 0.8.7 would panic.
In this implementation, we'd still mark java as detected but returns
empty version.

The 0.8.7 logic for detecting java version is found in
https://github.com/hashicorp/nomad/blob/v0.8.7/client/driver/java.go#L132-L172
.

I punt on revamping how we can be more resilient to java -version
syntax, and aimed for preserving existing behavior instead.
This commit is contained in:
Mahmood Ali
2019-02-12 13:41:26 -05:00
committed by GitHub
parent 09659b87ce
commit 0fd2b45740
2 changed files with 67 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/java/utils_test.go
View File

@@ -56,12 +56,24 @@ func TestDriver_parseJavaVersionOutput(t *testing.T) {
"OpenJDK Runtime Environment (IcedTea6 1.13.8) (6b36-1.13.8-0ubuntu1~12.04)",
"OpenJDK 64-Bit Server VM (build 23.25-b01, mixed mode)",
},
{
"Eclipse OpenJ9",
`openjdk version "1.8.0_192"
OpenJDK Runtime Environment (build 1.8.0_192-b12_openj9)
Eclipse OpenJ9 VM (build openj9-0.11.0, JRE 1.8.0 Linux amd64-64-Bit Compressed References
20181107_95 (JIT enabled, AOT enabled)
OpenJ9 - 090ff9dcd
OMR - ea548a66
JCL - b5a3affe73 based on jdk8u192-b12)`,
"1.8.0_192",
"OpenJDK Runtime Environment (build 1.8.0_192-b12_openj9)",
"Eclipse OpenJ9 VM (build openj9-0.11.0, JRE 1.8.0 Linux amd64-64-Bit Compressed References",
},
}
for _, c := range cases {
t.Run(c.name, func(t *testing.T) {
version, runtime, vm, err := parseJavaVersionOutput(c.output)
require.NoError(t, err)
version, runtime, vm := parseJavaVersionOutput(c.output)
require.Equal(t, c.version, version)
require.Equal(t, c.runtime, runtime)
@@ -92,3 +104,49 @@ func TestDriver_javaVersionInfo(t *testing.T) {
require.Equal(t, "Java HotSpot(TM) 64-Bit Server VM (build 24.80-b11, mixed mode)", vm)
}
func TestDriver_javaVersionInfo_UnexpectedOutput(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("test requires bash to run")
}
initCmd := javaVersionCommand
defer func() {
javaVersionCommand = initCmd
}()
javaVersionCommand = []string{
"/bin/sh", "-c",
fmt.Sprintf("printf '%%s\n' '%s' >/dev/stderr", "unexpected java -version output"),
}
version, runtime, vm, err := javaVersionInfo()
require.NoError(t, err)
require.Equal(t, "", version)
require.Equal(t, "", runtime)
require.Equal(t, "", vm)
}
func TestDriver_javaVersionInfo_JavaVersionFails(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("test requires bash to run")
}
initCmd := javaVersionCommand
defer func() {
javaVersionCommand = initCmd
}()
javaVersionCommand = []string{
"/bin/sh", "-c",
"exit 127",
}
version, runtime, vm, err := javaVersionInfo()
require.Error(t, err)
require.Contains(t, err.Error(), "failed to check java version")
require.Equal(t, "", version)
require.Equal(t, "", runtime)
require.Equal(t, "", vm)
}