[master] Bump Mesos to nightly master a1c6a7a #2808

mesosphere-teamcity · 2018-04-25T18:01:01Z

High-level description

This is a routine bump to the latest master branch of Mesos.

It also changes 2 DC/OS specific cherry-picks.

Following the recent change in UCR code an update of the cherry-pick related to the GPU isolator failure is required.
a9f5ddb8614ef057537994f389eb7e19f0c85652 -> 7659c405f51c1771fd341c9fad34085982774014
Following an update of the Web controllers in Apache Mesos, an update of the cherry-pick affecting those controllers is also required.
d523dba4ca02ad15c0ce2fb9a93a7a1d7ec0eedf -> b6d7b1f3ca61a536132b3e973c32dd695e181005

Related JIRA Issues

Checklist for all PRs

Included a test which will fail if code is reverted but test is not. If there is no test please explain here:
Read the DC/OS contributing guidelines
Followed relevant code rules Rules for Packages and Systemd

Checklist for component/package updates:

If you are changing components or packages in DC/OS (e.g. you are bumping the sha or ref of anything underneath packages), then in addition to the above please also include:

Change log from the last Mesos version integrated:
mesosphere/mesos diff
dcos/dcos-mesos-modules diff
mesosphere/dcos-ee-mesos-modules diff
Test Results: [link to CI job test results for component]
Code Coverage (if available): [link to code coverage report]

mesosphere-teamcity · 2018-04-25T18:01:01Z

@mesosphere-mergebot bump-ee

d2iq-mergebot · 2018-04-25T18:01:03Z

This repo has @mesosphere-mergebot integration. You can interact with the following commands.

@mesosphere-mergebot merge-it  
@mesosphere-mergebot bump-ee  
@mesosphere-mergebot override-status  
@mesosphere-mergebot label [Ship It |Request For Comment |Holding |Ready For Review |Work In Progress]

PR creators can apply one of [Ready For Review |Work In Progress]. Owners can apply any label.

d2iq-mergebot · 2018-04-25T18:01:23Z

Enterprise Bump PR: mesosphere/dcos-enterprise/pull/2668

rukletsov

Verified that https://github.com/mesosphere/mesos/commits/dcos-mesos-master-nightly-a1c6a7a points to the most recent master and has all necessary cherry-picks.

klueska · 2018-04-25T19:11:51Z

packages/mesos-modules/buildinfo.json

+  "single_source": {
+    "kind": "git",
+    "git": "https://github.com/dcos/dcos-mesos-modules.git",
+    "ref": "b0ecfa4466f0b377cc419b583f90c8c926aebc12",


Ack that this is the sha for the current head of the mesos modules repo.

klueska · 2018-04-25T19:14:34Z

packages/mesos/buildinfo.json

    "kind": "git",
    "git": "https://github.com/mesosphere/mesos",
-    "ref": "97de6eea9ad70f700082f70cd8d2584e199186df",
-    "ref_origin" : "dcos-mesos-master-e91ce42ed"
+    "ref": "7659c405f51c1771fd341c9fad34085982774014",


Ack that this is the tip of the dcos-mesos-master-nightly-a1c6a7a branch.
How can I verify that this is the desired branch though?
Would an encoding of the date after the word "nightly" make more sense than a random sha?

The SHA helps us identify the appropriate apache/mesos commit on top of which we applied the cherry-picks. We can certainly add some date as well but the SHA should still be left in there.

I see, so the a1c6a7a in dcos-mesos-master-nightly-a1c6a7a is the SHA on upstream master on top of which all of the commits below are being cherry-picked. No need for a date then, that's clear enough.

klueska · 2018-04-25T19:15:19Z

packages/mesos/patches.json

      "description": "Revert \"Fixed the broken metrics information of master in WebUI.\""
    },
    {
-      "ref": "a9f5ddb8614ef057537994f389eb7e19f0c85652",
+      "ref": "7659c405f51c1771fd341c9fad34085982774014",


Ack that this is the right commit at the tip of the branch.

klueska · 2018-04-25T19:15:59Z

packages/mesos/patches.json

    },
    {
-      "ref": "c9c5537b229fa55b5d5034b5fc40ae450fbbd08b",
+      "ref": "9796bf3d889397aa6ee707c937af4e8c757c9f2a",


Ack that this is the correct commit 2nd from the tip.

klueska · 2018-04-25T19:16:14Z

packages/mesos/patches.json

    },
    {
-      "ref": "d523dba4ca02ad15c0ce2fb9a93a7a1d7ec0eedf",
-      "description": "Mesos UI: Change paths, pailer, and logs to work with a reverse proxy"
+      "ref": "b6d7b1f3ca61a536132b3e973c32dd695e181005",


Ack that this is the correct commit 3rd from the tip.

klueska · 2018-04-25T19:16:32Z

packages/mesos/patches.json

@@ -3,19 +3,19 @@
  "git": "https://github.com/mesosphere/mesos",
  "patches": [
    {
-      "ref": "23dda3f685fbc552646ca5e4a560b1256640eda4",
-      "description": "Set LIBPROCESS_IP into docker container"
+      "ref": "0f762c15455900083f7a3f72c6cdc60a418ec12f",


Ack that this is the correct commit 4th from the tip.

klueska · 2018-04-25T19:17:01Z

packages/mesos-modules/buildinfo.json

-      "ref": "683d3c137ed66d6e9a7e5da622f62a7ce962d4d1",
-      "ref_origin": "master"
-    }
+  "requires": [


Just white space changes here?

klueska · 2018-04-25T19:17:12Z

packages/mesos/buildinfo.json

@@ -1,24 +1,29 @@
 {
-  "requires": ["openssl", "libevent", "curl", "boost-libs"],
-  "single_source" : {
+  "requires": [


Just white space changes here?

The whitespace changes, here and below, are fixing the previous ad-hoc formatting.

klueska · 2018-04-25T19:17:22Z

packages/mesos/buildinfo.json

-          "vm.max_map_count": 262144,
-          "vm.swappiness": 1
-      }
+    "dcos-mesos-slave": {


Just white space changes here?

karya0

Verified mesos commits.

mesosphere-teamcity · 2018-04-26T00:10:39Z

@mesosphere-mergebot label Ready For Review

d2iq-mergebot · 2018-04-30T00:00:06Z

👋 This PR has been inactive for 3 days. Please review the status checks to see what needs to be done to move it forward or change the label to Work in Progress. Thank you!

This reverts commit 9358a13, reversing changes made to 2d347c4.

rukletsov · 2018-05-08T15:47:10Z

This PR has been reverted and hence has not been merged!

Bumped Mesos to a1c6a7a.

fe9bf10

d2iq-mergebot added the Work In Progress label Apr 25, 2018

rukletsov requested review from karya0, klueska and Gilbert88 April 25, 2018 18:06

rukletsov approved these changes Apr 25, 2018

View reviewed changes

klueska approved these changes Apr 25, 2018

View reviewed changes

karya0 approved these changes Apr 25, 2018

View reviewed changes

gkleiman mentioned this pull request Apr 25, 2018

Fixed patch description in Mesos' patch.json. #2525

Closed

2 tasks

d2iq-mergebot added Ready For Review and removed Work In Progress labels Apr 26, 2018

mesosphere-mergebot-dev added Ship It and removed Ready For Review labels May 2, 2018

orsenthil pushed a commit to mesosphere/dcos that referenced this pull request May 4, 2018

Merge dcos#2808

4dde4b2

orsenthil mentioned this pull request May 4, 2018

Mergebot Train - May 4th #2846

Merged

orsenthil pushed a commit to mesosphere/dcos that referenced this pull request May 7, 2018

Merge dcos#2808

9358a13

orsenthil pushed a commit to mesosphere/dcos that referenced this pull request May 8, 2018

Revert "Merge dcos#2808"

3251c40

This reverts commit 9358a13, reversing changes made to 2d347c4.

d2iq-mergebot merged commit fe9bf10 into dcos:master May 8, 2018

karya0 mentioned this pull request May 14, 2018

Bumped Mesos and added patches to extra/patches. #2824

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[master] Bump Mesos to nightly master a1c6a7a #2808

[master] Bump Mesos to nightly master a1c6a7a #2808

mesosphere-teamcity commented Apr 25, 2018 •

edited by rukletsov

mesosphere-teamcity commented Apr 25, 2018

d2iq-mergebot commented Apr 25, 2018

d2iq-mergebot commented Apr 25, 2018

rukletsov left a comment

klueska Apr 25, 2018

klueska Apr 25, 2018

karya0 Apr 25, 2018

klueska Apr 25, 2018

karya0 Apr 25, 2018

klueska Apr 25, 2018

klueska Apr 25, 2018

klueska Apr 25, 2018

klueska Apr 25, 2018

klueska Apr 25, 2018

klueska Apr 25, 2018

karya0 Apr 25, 2018

klueska Apr 25, 2018

karya0 left a comment

mesosphere-teamcity commented Apr 26, 2018

d2iq-mergebot commented Apr 30, 2018

rukletsov commented May 8, 2018

[master] Bump Mesos to nightly master a1c6a7a #2808

[master] Bump Mesos to nightly master a1c6a7a #2808

Conversation

mesosphere-teamcity commented Apr 25, 2018 • edited by rukletsov

High-level description

Related JIRA Issues

Checklist for all PRs

Checklist for component/package updates:

mesosphere-teamcity commented Apr 25, 2018

d2iq-mergebot commented Apr 25, 2018

d2iq-mergebot commented Apr 25, 2018

rukletsov left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

karya0 left a comment

Choose a reason for hiding this comment

mesosphere-teamcity commented Apr 26, 2018

d2iq-mergebot commented Apr 30, 2018

rukletsov commented May 8, 2018

mesosphere-teamcity commented Apr 25, 2018 •

edited by rukletsov