Find marathon manifest path
ClosedAll Users
Actions

"url": "https://s3.amazonaws.com/downloads.mesosphere.io/marathon/snapshots/marathon-1.5.0-74-g906ceee.tgz",
"sha1": "9a29b5c051da36a5638d558a39382232719ddf8d"

＼\ ٩( ᐛ )و /／

jenkins requested changes to this revision.Sep 15 2017, 2:10 AM

This revision now requires changes to proceed.Sep 15 2017, 2:10 AM

✗ Build of 4278 failed jenkins-public-marathon-phabricator-1020.

Error message:

Stage Compile and Test failed.

(๑′°︿°๑)

Harbormaster failed to build B3493: Diff 4278!Sep 15 2017, 2:11 AM

timcharper added a reviewer: unterstein.Sep 18 2017, 5:05 PM

jenkins accepted this revision.Sep 18 2017, 5:27 PM

This revision is now accepted and ready to land.Sep 18 2017, 5:27 PM

✔ Build of 4278 completed jenkins-public-marathon-phabricator-1026.

You can create a DC/OS with your patched Marathon by creating a new pull
request with the following changes in buildinfo.json:

＼\ ٩( ᐛ )و /／

Harbormaster completed building B3493: Diff 4278.Sep 18 2017, 5:27 PM

src/main/scala/mesosphere/marathon/BuildInfo.scala
30	I might be wrong, but shouldn't we close the input stream after use?

we should double check Nikita's question. If close needed, we should close it, Lgtm otherwise. Go for merge if question resolved 🎉

src/main/scala/mesosphere/marathon/BuildInfo.scala
30	Great catch! I was in the mode of "fix the bug at hand", and didn't notice this was broken before. I'll submit another patch.

Closed by commit rMARATHON982704446473: Find marathon manifest path (authored by timcharper). · Explain WhySep 20 2017, 5:17 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

			Path	Packages
M			src/main/scala/mesosphere/marathon/BuildInfo.scala (27 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	4277	906ceee		Sep 15 2017, 1:50 AM	★	★
Diff 2	4278	906ceee	jira issue	Sep 15 2017, 1:52 AM	★	★
Diff 3	4293	f2d04a8	rMARATHON982704446473a070b3b12fe64998a401ea5c77f8	Sep 20 2017, 5:17 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
753852ee1954	c9f84b12f2c8	906ceee6871f	Tim Harper	Find marathon manifest path (Show More…)	Sep 15 2017, 1:46 AM

Diff 4293

View Options

src/main/scala/mesosphere/marathon/BuildInfo.scala

1	1		package mesosphere.marathon
2	2
3	3		import java.util.jar.{ Attributes, Manifest }
4	4		import scala.Predef._
5			import scala.util.Try
6	5		import scala.util.control.NonFatal
	6		import mesosphere.marathon.stream.Implicits._
7	7
8	8		case object BuildInfo {
	9		private val marathonJar = "\\bmesosphere\\.marathon\\.marathon-[0-9.]+".r
9	10		lazy val DefaultMajor = 1
10	11		lazy val DefaultMinor = 5
11	12		lazy val DefaultPatch = 0
12	13
13	14		lazy val DefaultBuildVersion = s"$DefaultMajor.$DefaultMinor.$DefaultPatch-SNAPSHOT"
14	15
15			lazy val manifest: Option[Manifest] = Try {
	16		/**
	17		* sbt-native-package provides all of the files as individual JARs. By default, `getResourceAsStream` returns the
	18		* first matching file for the first JAR in the class path. Instead, we need to enumerate through all of the
	19		* manifests, and find the one that applies to the Marathon application jar.
	20		*/
	21		private lazy val marathonManifestPath: List[java.net.URL] =
	22		getClass().getClassLoader().getResources("META-INF/MANIFEST.MF").toIterator.filter { manifest =>
	23		marathonJar.findFirstMatchIn(manifest.getPath).nonEmpty
	24		}.toList
	25
	26		lazy val manifest: Option[Manifest] = marathonManifestPath match {
	27		case Nil => None
	28		case List(file) =>
16	29		val mf = new Manifest()
17			mf.read(getClass().getClassLoader().getResourceAsStream("META-INF/MANIFEST.MF"))
	30		mf.read(file.openStream)
		meln1kUnsubmitted Not Done I might be wrong, but shouldn't we close the input stream after use?
		timcharperAuthorUnsubmitted Not Done Great catch! I was in the mode of "fix the bug at hand", and didn't notice this was broken before. I'll submit another patch.
18			mf
19			}.toOption
	31		Some(mf)
	32		case otherwise =>
	33		throw new RuntimeException(s"Multiple marathon JAR manifests returned! ${otherwise}")
	34		}
20	35
21	36		lazy val attributes: Option[Attributes] = manifest.map(_.getMainAttributes())
22	37
23	38		def getAttribute(name: String): Option[String] = attributes.flatMap { attrs =>
24	39		try {
25	40		Option(attrs.getValue(name))
26	41		} catch {
27	42		case NonFatal(_) => None
Show All 19 Lines

Find marathon manifest pathClosedAll UsersActions

Details

Diff Detail

＼\ ٩( ᐛ )و /／

(๑′°︿°๑)

＼\ ٩( ᐛ )و /／

Revision Contents

Diff 4293

src/main/scala/mesosphere/marathon/BuildInfo.scala

Find marathon manifest path
ClosedAll Users
Actions