drea86

Aurora GIT Hash

Sep 9th, 2015
174
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.66 KB | None | 0 0
  1. commit f3cbc399ef85f7976ab984c83a43b113a9db0e83
  2. Author: Maxim Khutornenko <[email protected]>
  3. Date: Wed Sep 2 21:23:51 2015 -0700
  4.  
  5. Adding oversubscription e2e tests.
  6.  
  7. Bugs closed: AURORA-1464
  8.  
  9. Reviewed at https://reviews.apache.org/r/37926/
  10.  
  11. diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/u
  12. index e909451..f710295 100644
  13. --- a/examples/vagrant/upstart/aurora-scheduler.conf
  14. +++ b/examples/vagrant/upstart/aurora-scheduler.conf
  15. @@ -45,4 +45,5 @@ exec bin/aurora-scheduler \
  16. -use_beta_db_task_store=true \
  17. -shiro_ini_path=etc/shiro.example.ini \
  18. -enable_h2_console=true \
  19. - -tier_config=/home/vagrant/aurora/src/test/resources/org/apache/aurora/schedu
  20. + -tier_config=/home/vagrant/aurora/src/test/resources/org/apache/aurora/schedu
  21. + -receive_revocable_resources=true
  22. :...skipping...
  23. commit f3cbc399ef85f7976ab984c83a43b113a9db0e83
  24. Author: Maxim Khutornenko <[email protected]>
  25. Date: Wed Sep 2 21:23:51 2015 -0700
  26.  
  27. Adding oversubscription e2e tests.
  28.  
  29. Bugs closed: AURORA-1464
  30.  
  31. Reviewed at https://reviews.apache.org/r/37926/
  32.  
  33. diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/u
  34. index e909451..f710295 100644
  35. --- a/examples/vagrant/upstart/aurora-scheduler.conf
  36. +++ b/examples/vagrant/upstart/aurora-scheduler.conf
  37. @@ -45,4 +45,5 @@ exec bin/aurora-scheduler \
  38. -use_beta_db_task_store=true \
  39. -shiro_ini_path=etc/shiro.example.ini \
  40. -enable_h2_console=true \
  41. - -tier_config=/home/vagrant/aurora/src/test/resources/org/apache/aurora/schedu
  42. + -tier_config=/home/vagrant/aurora/src/test/resources/org/apache/aurora/schedu
  43. + -receive_revocable_resources=true
  44. \ No newline at end of file
  45. :...skipping...
  46. commit f3cbc399ef85f7976ab984c83a43b113a9db0e83
  47. Author: Maxim Khutornenko <[email protected]>
  48. Date: Wed Sep 2 21:23:51 2015 -0700
  49.  
  50. Adding oversubscription e2e tests.
  51.  
  52. Bugs closed: AURORA-1464
  53.  
  54. Reviewed at https://reviews.apache.org/r/37926/
  55.  
  56. diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
  57. index e909451..f710295 100644
  58. --- a/examples/vagrant/upstart/aurora-scheduler.conf
  59. +++ b/examples/vagrant/upstart/aurora-scheduler.conf
  60. @@ -45,4 +45,5 @@ exec bin/aurora-scheduler \
  61. -use_beta_db_task_store=true \
  62. -shiro_ini_path=etc/shiro.example.ini \
  63. -enable_h2_console=true \
  64. - -tier_config=/home/vagrant/aurora/src/test/resources/org/apache/aurora/scheduler/tiers-example.json
  65. + -tier_config=/home/vagrant/aurora/src/test/resources/org/apache/aurora/scheduler/tiers-example.json \
  66. + -receive_revocable_resources=true
  67. \ No newline at end of file
  68. diff --git a/examples/vagrant/upstart/mesos-slave.conf b/examples/vagrant/upstart/mesos-slave.conf
  69. index 2b6a606..9af680e 100644
  70. --- a/examples/vagrant/upstart/mesos-slave.conf
  71. +++ b/examples/vagrant/upstart/mesos-slave.conf
  72. @@ -29,4 +29,17 @@ exec /usr/sbin/mesos-slave --master=zk://$ZK_HOST:2181/mesos/master \
  73. --attributes="host:$MY_HOST;rack:a" \
  74. --resources="cpus:4;mem:1024;disk:20000" \
  75. --work_dir="/var/lib/mesos" \
  76. - --containerizers=docker,mesos
  77. + --containerizers=docker,mesos \
  78. + --resource_estimator="org_apache_mesos_FixedResourceEstimator" \
  79. + --modules='{
  80. + "libraries": {
  81. + "file": "/usr/lib/libfixed_resource_estimator.so",
  82. + "modules": {
  83. + "name": "org_apache_mesos_FixedResourceEstimator",
  84. + "parameters": {
  85. + "key": "resources",
  86. + "value": "cpus:3"
  87. + }
  88. + }
  89. + }
  90. + }'
  91. diff --git a/src/main/java/org/apache/aurora/scheduler/http/Offers.java b/src/main/java/org/apache/aurora/scheduler/http/Offers.java
  92. :
Advertisement
Add Comment
Please, Sign In to add comment