Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- commit f3cbc399ef85f7976ab984c83a43b113a9db0e83
- Author: Maxim Khutornenko <[email protected]>
- Date: Wed Sep 2 21:23:51 2015 -0700
- Adding oversubscription e2e tests.
- Bugs closed: AURORA-1464
- Reviewed at https://reviews.apache.org/r/37926/
- diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/u
- index e909451..f710295 100644
- --- a/examples/vagrant/upstart/aurora-scheduler.conf
- +++ b/examples/vagrant/upstart/aurora-scheduler.conf
- @@ -45,4 +45,5 @@ exec bin/aurora-scheduler \
- -use_beta_db_task_store=true \
- -shiro_ini_path=etc/shiro.example.ini \
- -enable_h2_console=true \
- - -tier_config=/home/vagrant/aurora/src/test/resources/org/apache/aurora/schedu
- + -tier_config=/home/vagrant/aurora/src/test/resources/org/apache/aurora/schedu
- + -receive_revocable_resources=true
- :...skipping...
- commit f3cbc399ef85f7976ab984c83a43b113a9db0e83
- Author: Maxim Khutornenko <[email protected]>
- Date: Wed Sep 2 21:23:51 2015 -0700
- Adding oversubscription e2e tests.
- Bugs closed: AURORA-1464
- Reviewed at https://reviews.apache.org/r/37926/
- diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/u
- index e909451..f710295 100644
- --- a/examples/vagrant/upstart/aurora-scheduler.conf
- +++ b/examples/vagrant/upstart/aurora-scheduler.conf
- @@ -45,4 +45,5 @@ exec bin/aurora-scheduler \
- -use_beta_db_task_store=true \
- -shiro_ini_path=etc/shiro.example.ini \
- -enable_h2_console=true \
- - -tier_config=/home/vagrant/aurora/src/test/resources/org/apache/aurora/schedu
- + -tier_config=/home/vagrant/aurora/src/test/resources/org/apache/aurora/schedu
- + -receive_revocable_resources=true
- \ No newline at end of file
- :...skipping...
- commit f3cbc399ef85f7976ab984c83a43b113a9db0e83
- Author: Maxim Khutornenko <[email protected]>
- Date: Wed Sep 2 21:23:51 2015 -0700
- Adding oversubscription e2e tests.
- Bugs closed: AURORA-1464
- Reviewed at https://reviews.apache.org/r/37926/
- diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
- index e909451..f710295 100644
- --- a/examples/vagrant/upstart/aurora-scheduler.conf
- +++ b/examples/vagrant/upstart/aurora-scheduler.conf
- @@ -45,4 +45,5 @@ exec bin/aurora-scheduler \
- -use_beta_db_task_store=true \
- -shiro_ini_path=etc/shiro.example.ini \
- -enable_h2_console=true \
- - -tier_config=/home/vagrant/aurora/src/test/resources/org/apache/aurora/scheduler/tiers-example.json
- + -tier_config=/home/vagrant/aurora/src/test/resources/org/apache/aurora/scheduler/tiers-example.json \
- + -receive_revocable_resources=true
- \ No newline at end of file
- diff --git a/examples/vagrant/upstart/mesos-slave.conf b/examples/vagrant/upstart/mesos-slave.conf
- index 2b6a606..9af680e 100644
- --- a/examples/vagrant/upstart/mesos-slave.conf
- +++ b/examples/vagrant/upstart/mesos-slave.conf
- @@ -29,4 +29,17 @@ exec /usr/sbin/mesos-slave --master=zk://$ZK_HOST:2181/mesos/master \
- --attributes="host:$MY_HOST;rack:a" \
- --resources="cpus:4;mem:1024;disk:20000" \
- --work_dir="/var/lib/mesos" \
- - --containerizers=docker,mesos
- + --containerizers=docker,mesos \
- + --resource_estimator="org_apache_mesos_FixedResourceEstimator" \
- + --modules='{
- + "libraries": {
- + "file": "/usr/lib/libfixed_resource_estimator.so",
- + "modules": {
- + "name": "org_apache_mesos_FixedResourceEstimator",
- + "parameters": {
- + "key": "resources",
- + "value": "cpus:3"
- + }
- + }
- + }
- + }'
- diff --git a/src/main/java/org/apache/aurora/scheduler/http/Offers.java b/src/main/java/org/apache/aurora/scheduler/http/Offers.java
- :
Advertisement
Add Comment
Please, Sign In to add comment