You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2019/08/20 13:46:03 UTC
[mesos] branch master updated (deeae14 -> d42ae09)
This is an automated email from the ASF dual-hosted git repository.
bennoe pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git.
from deeae14 Performed periodic storage local provider reconciliations.
new 188c83a Fixed a flaky operation reconciliation test.
new 021540a Added more details to the Bintray release guide.
new d42ae09 Updated CentOS 6 dockerfile to properly install devtoolset-7.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/release-guide.md | 31 +++++++++++++++++++++-------
src/tests/operation_reconciliation_tests.cpp | 15 +++++++++++---
support/packaging/centos/centos6.dockerfile | 9 +++++---
3 files changed, 42 insertions(+), 13 deletions(-)
[mesos] 01/03: Fixed a flaky operation reconciliation test.
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bennoe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 188c83af78d0357523d53f75b6e1b05b59f461c2
Author: Benno Evers <be...@mesosphere.com>
AuthorDate: Tue Aug 13 17:26:02 2019 +0200
Fixed a flaky operation reconciliation test.
The FrameworkReconciliationRaceWithUpdateSlave test from the
operation reconciliation tests was flaky since we did not wait
for the scheduler to reconnect before attempting to send a
subscribe call.
Review: https://reviews.apache.org/r/71297
---
src/tests/operation_reconciliation_tests.cpp | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/tests/operation_reconciliation_tests.cpp b/src/tests/operation_reconciliation_tests.cpp
index 9d084c0..12552d3 100644
--- a/src/tests/operation_reconciliation_tests.cpp
+++ b/src/tests/operation_reconciliation_tests.cpp
@@ -1833,11 +1833,15 @@ TEST_P(
EXPECT_EQ(OPERATION_FINISHED, finishedUpdate->status().state());
EXPECT_TRUE(finishedUpdate->status().has_uuid());
+ Future<mesos::v1::scheduler::Mesos*> disconnected;
EXPECT_CALL(*scheduler, disconnected(_))
- .Times(2);
+ .Times(1)
+ .WillOnce(FutureArg<0>(&disconnected));
+ Future<mesos::v1::scheduler::Mesos*> connected;
EXPECT_CALL(*scheduler, connected(_))
- .Times(2);
+ .Times(1)
+ .WillOnce(FutureArg<0>(&connected));
// Drop the `UpdateSlaveMessage` which contains the resubscribed resource
// provider in order to simulate a race between this message and the
@@ -1845,8 +1849,12 @@ TEST_P(
updateSlaveMessage = DROP_PROTOBUF(UpdateSlaveMessage(), _, _);
// Restart the master to clear out the master's operation state and force
- // an agent reregistration.
+ // an agent reregistration. Also appoint `None()` to avoid a spurious
+ // detection of the master since it reuses the same `UPID`.
+ detector->appoint(None());
master->reset();
+ AWAIT_READY(disconnected);
+
master = StartMaster();
ASSERT_SOME(master);
@@ -1866,6 +1874,7 @@ TEST_P(
frameworkInfo.mutable_id()->CopyFrom(frameworkId);
+ AWAIT_READY(connected);
mesos.send(createCallSubscribe(frameworkInfo, frameworkId));
AWAIT_READY(resubscribed);
[mesos] 03/03: Updated CentOS 6 dockerfile to properly install
devtoolset-7.
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bennoe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit d42ae097e3891670e8f65a0827b33c8444febdf6
Author: Benno Evers <be...@mesosphere.com>
AuthorDate: Tue Aug 20 14:33:27 2019 +0200
Updated CentOS 6 dockerfile to properly install devtoolset-7.
The previously used yum command was not able to properly install
the required `devtoolset-7` package since the containing repository
was only visible after the first `yum` invocation finished.
This would result in `yum` silently ignoring the package, producing
a broken CentOS 6 docker image.
Review: https://reviews.apache.org/r/71329
---
support/packaging/centos/centos6.dockerfile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/support/packaging/centos/centos6.dockerfile b/support/packaging/centos/centos6.dockerfile
index bb8d591..3151ba9 100644
--- a/support/packaging/centos/centos6.dockerfile
+++ b/support/packaging/centos/centos6.dockerfile
@@ -1,7 +1,6 @@
FROM centos:6
MAINTAINER Kapil Arya <ka...@apache.org>
-# Get curl.
RUN yum install -y \
centos-release-scl \
epel-release \
@@ -9,8 +8,12 @@ RUN yum install -y \
redhat-rpm-config \
rpm-build \
scl-utils \
- yum-utils \
- devtoolset-7
+ yum-utils
+
+# We need to install `devtoolset-7` in a separate step because the
+# repository containing it only gets added during installation of
+# the `centos-release-scl` package.
+RUN yum install -y devtoolset-7
# Add the Subversion repo.
RUN echo -e '[WANdiscoSVN]\n\
[mesos] 02/03: Added more details to the Bintray release guide.
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bennoe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 021540a0a9ae8bd67c4c2edba97c4f6e9abcd902
Author: Benno Evers <be...@mesosphere.com>
AuthorDate: Mon Aug 19 18:53:30 2019 +0200
Added more details to the Bintray release guide.
Review: https://reviews.apache.org/r/71309
---
docs/release-guide.md | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/docs/release-guide.md b/docs/release-guide.md
index 88281d6..9ea54cc 100644
--- a/docs/release-guide.md
+++ b/docs/release-guide.md
@@ -303,17 +303,34 @@ Update the Mesos Homebrew package.
Upload the binary RPM packages to Bintray:
-1. Create/use a Bintray account with access to the [Bintray repo](https://bintray.com/apache/mesos).
+1. If you haven't done so, sign up for bintray and request membership in the apache organization.
+ Get your API key by clicking on `Edit profile` and then `API Key` on Bintray
-2. Trigger a build of the [CentOS packaging job](https://builds.apache.org/view/M-R/view/Mesos/job/Mesos/job/Packaging/job/CentosRPMs/)
- in the Apache Jenkins using the `MESOS_TAG` of the version being released.
+2. Go to the [Bintray package](https://bintray.com/apache/mesos/mesos) and click the `Add a version` button.
+ Enter the version number as `Name`, set the appropriate release date and click `Create`.
-3. Create a new Mesos version on bintray.
+3. Go to [Apache Jenkins](https://builds.apache.org/job/Mesos/job/Packaging/job/CentosRPMs) and start a
+ manual run of the `CentosRPMs` job to generate official binary packages for this version.
-4. Download the generated RPM artifacts from the Jenkins job above and upload them
- to the new release on bintray.
+4. Upload the files generated in step 3 to Bintray. Note that you cannot use the web interface
+ for this step, since it has a file size limit of 250MiB as of the time of this writing.
-5. On the bintray website, navigate to the new release and click 'Publish Artifacts'.
+ To upload, use a command like this, replacing file name and version number where necessary:
+
+ curl \
+ -u<username>:<api-key> \
+ -H Content-Type:application/json \
+ -H Accept:application/json \
+ -T ./mesos-debuginfo-1.8.1-1.el7.x86_64.rpm \
+ -H X-Bintray-Package:mesos \
+ -H X-Bintray-Version:1.8.1 \
+ -H X-Bintray-Publish:0 \
+ https://api.bintray.com/content/apache/mesos/el7/x86_64/mesos-debuginfo-1.8.1-1.el7.x86_64.rpm
+
+ (NOTE: The correct upload URL for the package is `apache/mesos/` whereas the web UI is at `apache/mesos/mesos/`.)
+
+5. Go back to the bintray web interface, verify that you uploaded the correct files to the correct location
+ and finally click on `Publish all`.
Update Wikipedia: