You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2019/07/04 22:08:06 UTC
[mesos] branch master updated (f642368 -> fa12221)
This is an automated email from the ASF dual-hosted git repository.
bmahler pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git.
from f642368 Fixed flaky test `UpdateFrameworkV0Test.SuppressedRoles`.
new 286d7bd Added reviveOffers(roles) to V0 Java bindings.
new fa12221 Added suppressOffers(roles) to V0 Java bindings.
The 2 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:
.../jni/org_apache_mesos_MesosSchedulerDriver.cpp | 48 +++++++++++++++++++++-
.../src/org/apache/mesos/MesosSchedulerDriver.java | 4 ++
src/java/src/org/apache/mesos/SchedulerDriver.java | 29 +++++++++++++
3 files changed, 79 insertions(+), 2 deletions(-)
[mesos] 01/02: Added reviveOffers(roles) to V0 Java bindings.
Posted by bm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 286d7bd1cd3a62d244c0ac3216d4a130d1408a99
Author: Andrei Sekretenko <as...@mesosphere.io>
AuthorDate: Thu Jul 4 18:05:53 2019 -0400
Added reviveOffers(roles) to V0 Java bindings.
Review: https://reviews.apache.org/r/70947/
---
.../jni/org_apache_mesos_MesosSchedulerDriver.cpp | 24 +++++++++++++++++++++-
.../src/org/apache/mesos/MesosSchedulerDriver.java | 2 ++
src/java/src/org/apache/mesos/SchedulerDriver.java | 15 ++++++++++++++
3 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp b/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp
index f81a69a..fd852fd 100644
--- a/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp
+++ b/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp
@@ -938,7 +938,7 @@ Java_org_apache_mesos_MesosSchedulerDriver_declineOffer(
* Signature: ()Lorg/apache/mesos/Protos/Status;
*/
JNIEXPORT jobject JNICALL
-Java_org_apache_mesos_MesosSchedulerDriver_reviveOffers(
+Java_org_apache_mesos_MesosSchedulerDriver_reviveOffers__(
JNIEnv* env, jobject thiz)
{
jclass clazz = env->GetObjectClass(thiz);
@@ -955,6 +955,28 @@ Java_org_apache_mesos_MesosSchedulerDriver_reviveOffers(
/*
* Class: org_apache_mesos_MesosSchedulerDriver
+ * Method: reviveOffersForRoles
+ * Signature: (Ljava/util/Collection;)Lorg/apache/mesos/Protos/Status;
+ */
+JNIEXPORT jobject JNICALL
+Java_org_apache_mesos_MesosSchedulerDriver_reviveOffers__Ljava_util_Collection_2( // NOLINT(whitespace/line_length)
+ JNIEnv* env, jobject thiz, jobject jroles)
+{
+ jclass clazz = env->GetObjectClass(thiz);
+
+ jfieldID __driver = env->GetFieldID(clazz, "__driver", "J");
+ MesosSchedulerDriver* driver =
+ (MesosSchedulerDriver*) env->GetLongField(thiz, __driver);
+
+ Status status =
+ driver->reviveOffers(constructFromIterable<string>(env, jroles));
+
+ return convert<Status>(env, status);
+}
+
+
+/*
+ * Class: org_apache_mesos_MesosSchedulerDriver
* Method: suppressOffers
* Signature: ()Lorg/apache/mesos/Protos/Status;
*/
diff --git a/src/java/src/org/apache/mesos/MesosSchedulerDriver.java b/src/java/src/org/apache/mesos/MesosSchedulerDriver.java
index 772a738..c373436 100644
--- a/src/java/src/org/apache/mesos/MesosSchedulerDriver.java
+++ b/src/java/src/org/apache/mesos/MesosSchedulerDriver.java
@@ -393,6 +393,8 @@ public class MesosSchedulerDriver implements SchedulerDriver {
public native Status reviveOffers();
+ public native Status reviveOffers(Collection<String> roles);
+
public native Status suppressOffers();
public native Status acknowledgeStatusUpdate(TaskStatus status);
diff --git a/src/java/src/org/apache/mesos/SchedulerDriver.java b/src/java/src/org/apache/mesos/SchedulerDriver.java
index 155e4ac..25ba439 100644
--- a/src/java/src/org/apache/mesos/SchedulerDriver.java
+++ b/src/java/src/org/apache/mesos/SchedulerDriver.java
@@ -269,6 +269,21 @@ public interface SchedulerDriver {
Status reviveOffers();
/**
+ * Removes filters for the specified roles and removes these roles from
+ * the suppressed set. If the framework is not connected to the master,
+ * an up-to-date set of suppressed roles will be sent to the master
+ * during re-registration.
+ *
+ * @param roles The collection of the framework roles to be revivied.
+ * If empty, this method does nothing.
+ *
+ * @return The state of the driver after the call.
+ *
+ * @see Status
+ */
+ Status reviveOffers(Collection<String> roles);
+
+ /**
* Informs Mesos master to stop sending offers to the framework (i.e.
* to suppress all roles of the framework). To resume getting offers,
* the scheduler can call reviveOffers() or set the suppressed roles
[mesos] 02/02: Added suppressOffers(roles) to V0 Java bindings.
Posted by bm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit fa122214fdabbb140971059b5ea21d8542850df7
Author: Andrei Sekretenko <as...@mesosphere.io>
AuthorDate: Thu Jul 4 18:07:21 2019 -0400
Added suppressOffers(roles) to V0 Java bindings.
Review: https://reviews.apache.org/r/70985/
---
.../jni/org_apache_mesos_MesosSchedulerDriver.cpp | 24 +++++++++++++++++++++-
.../src/org/apache/mesos/MesosSchedulerDriver.java | 2 ++
src/java/src/org/apache/mesos/SchedulerDriver.java | 14 +++++++++++++
3 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp b/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp
index fd852fd..1817bba 100644
--- a/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp
+++ b/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp
@@ -981,7 +981,7 @@ Java_org_apache_mesos_MesosSchedulerDriver_reviveOffers__Ljava_util_Collection_2
* Signature: ()Lorg/apache/mesos/Protos/Status;
*/
JNIEXPORT jobject JNICALL
-Java_org_apache_mesos_MesosSchedulerDriver_suppressOffers(
+Java_org_apache_mesos_MesosSchedulerDriver_suppressOffers__(
JNIEnv* env, jobject thiz)
{
jclass clazz = env->GetObjectClass(thiz);
@@ -998,6 +998,28 @@ Java_org_apache_mesos_MesosSchedulerDriver_suppressOffers(
/*
* Class: org_apache_mesos_MesosSchedulerDriver
+ * Method: suppressOffersForRoles
+ * Signature: (Ljava/util/Collection;)Lorg/apache/mesos/Protos/Status;
+ */
+JNIEXPORT jobject JNICALL
+Java_org_apache_mesos_MesosSchedulerDriver_suppressOffers__Ljava_util_Collection_2( // NOLINT(whitespace/line_length)
+ JNIEnv* env, jobject thiz, jobject jroles)
+{
+ jclass clazz = env->GetObjectClass(thiz);
+
+ jfieldID __driver = env->GetFieldID(clazz, "__driver", "J");
+ MesosSchedulerDriver* driver =
+ (MesosSchedulerDriver*) env->GetLongField(thiz, __driver);
+
+ Status status =
+ driver->suppressOffers(constructFromIterable<string>(env, jroles));
+
+ return convert<Status>(env, status);
+}
+
+
+/*
+ * Class: org_apache_mesos_MesosSchedulerDriver
* Method: requestResources
* Signature: (Ljava/util/Collection;)Lorg/apache/mesos/Protos/Status;
*/
diff --git a/src/java/src/org/apache/mesos/MesosSchedulerDriver.java b/src/java/src/org/apache/mesos/MesosSchedulerDriver.java
index c373436..3e74be9 100644
--- a/src/java/src/org/apache/mesos/MesosSchedulerDriver.java
+++ b/src/java/src/org/apache/mesos/MesosSchedulerDriver.java
@@ -397,6 +397,8 @@ public class MesosSchedulerDriver implements SchedulerDriver {
public native Status suppressOffers();
+ public native Status suppressOffers(Collection<String> roles);
+
public native Status acknowledgeStatusUpdate(TaskStatus status);
public native Status sendFrameworkMessage(ExecutorID executorId,
diff --git a/src/java/src/org/apache/mesos/SchedulerDriver.java b/src/java/src/org/apache/mesos/SchedulerDriver.java
index 25ba439..e04916e 100644
--- a/src/java/src/org/apache/mesos/SchedulerDriver.java
+++ b/src/java/src/org/apache/mesos/SchedulerDriver.java
@@ -301,6 +301,20 @@ public interface SchedulerDriver {
Status suppressOffers();
/**
+ * Adds the roles to the suppressed set. If the framework is not connected
+ * to the master, an up-to-date set of suppressed roles will be sent to
+ * the master during re-registration.
+ *
+ * @param roles The collection of framework roles to be suppressed.
+ * If empty, the method does nothing.
+ *
+ * @return The state of the driver after the call.
+ *
+ * @see Status
+ */
+ Status suppressOffers(Collection<String> roles);
+
+ /**
* Acknowledges the status update. This should only be called
* once the status update is processed durably by the scheduler.
* Not that explicit acknowledgements must be requested via the