Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] Bump Mesos to nightly master a1c6a7a #2808

Merged
merged 1 commit into from
May 8, 2018
Merged

[master] Bump Mesos to nightly master a1c6a7a #2808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 10 additions & 7 deletions packages/mesos-modules/buildinfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"requires": ["mesos", "boost-libs"],
"single_source" : {
"kind": "git",
"git": "https://github.com/dcos/dcos-mesos-modules.git",
"ref": "683d3c137ed66d6e9a7e5da622f62a7ce962d4d1",
"ref_origin": "master"
}
"requires": [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just white space changes here?

"mesos",
"boost-libs"
],
"single_source": {
"kind": "git",
"git": "https://github.com/dcos/dcos-mesos-modules.git",
"ref": "b0ecfa4466f0b377cc419b583f90c8c926aebc12",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

"ref_origin": "master"
}
}
29 changes: 17 additions & 12 deletions packages/mesos/buildinfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
{
"requires": ["openssl", "libevent", "curl", "boost-libs"],
"single_source" : {
"requires": [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just white space changes here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

"openssl",
"libevent",
"curl",
"boost-libs"
],
"single_source": {
"kind": "git",
"git": "https://github.com/mesosphere/mesos",
"ref": "97de6eea9ad70f700082f70cd8d2584e199186df",
"ref_origin" : "dcos-mesos-master-e91ce42ed"
"ref": "7659c405f51c1771fd341c9fad34085982774014",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup.

"ref_origin": "dcos-mesos-master-nightly-a1c6a7a"
},
"environment": {
"JAVA_LIBRARY_PATH": "/opt/mesosphere/lib",
"MESOS_NATIVE_JAVA_LIBRARY": "/opt/mesosphere/lib/libmesos.so"
},
"state_directory": true,
"sysctl": {
"dcos-mesos-slave": {
"vm.max_map_count": 262144,
"vm.swappiness": 1
},
"dcos-mesos-slave-public": {
"vm.max_map_count": 262144,
"vm.swappiness": 1
}
"dcos-mesos-slave": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just white space changes here?

"vm.max_map_count": 262144,
"vm.swappiness": 1
},
"dcos-mesos-slave-public": {
"vm.max_map_count": 262144,
"vm.swappiness": 1
}
}
}
12 changes: 6 additions & 6 deletions packages/mesos/patches.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
"git": "https://github.com/mesosphere/mesos",
"patches": [
{
"ref": "23dda3f685fbc552646ca5e4a560b1256640eda4",
"description": "Set LIBPROCESS_IP into docker container"
"ref": "0f762c15455900083f7a3f72c6cdc60a418ec12f",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

"description": "Set LIBPROCESS_IP into docker container."
},
{
"ref": "d523dba4ca02ad15c0ce2fb9a93a7a1d7ec0eedf",
"description": "Mesos UI: Change paths, pailer, and logs to work with a reverse proxy"
"ref": "b6d7b1f3ca61a536132b3e973c32dd695e181005",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

"description": "Mesos UI: updated the URL generation to make it work with adminrouter."
},
{
"ref": "c9c5537b229fa55b5d5034b5fc40ae450fbbd08b",
"ref": "9796bf3d889397aa6ee707c937af4e8c757c9f2a",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

"description": "Updated mesos containerizer to ignore GPU isolator creation failure."
}
]
Expand Down