Modified: 
mesos/site/source/documentation/latest/app-framework-development-guide.md
URL: 
http://svn.apache.org/viewvc/mesos/site/source/documentation/latest/app-framework-development-guide.md?rev=1700176&r1=1700175&r2=1700176&view=diff
==============================================================================
--- mesos/site/source/documentation/latest/app-framework-development-guide.md 
(original)
+++ mesos/site/source/documentation/latest/app-framework-development-guide.md 
Sun Aug 30 23:41:46 2015
@@ -210,6 +210,67 @@ You need to put your framework somewhere
 
 Once you are sure that your executors are available to the mesos-slaves, you 
should be able to run your scheduler, which will register with the Mesos 
master, and start receiving resource offers!
 
+
+## Labels
+
+`Labels` can be found in the `TaskInfo`, `DiscoveryInfo` and `TaskStatus`s and
+let's framework and module writers use Labels to tag and pass unstructured
+information around Mesos. Labels are free-form key-value pairs supplied by the
+framework scheduler or label decorator hooks. Below is the protobuf definitions
+of labels:
+
+~~~{.proto}
+  optional Labels labels = 11;
+~~~
+
+~~~{.proto}
+/**
+ * Collection of labels.
+ */
+message Labels {
+    repeated Label labels = 1;
+}
+
+/**
+ * Key, value pair used to store free form user-data.
+ */
+message Label {
+  required string key = 1;
+  optional string value = 2;
+}
+~~~
+
+Labels are not interpreted by Mesos itself, but will be made available over
+master and slave state endpoints. Further more, the executor and scheduler can
+introspect labels on the TaskInfo and TaskStatus programmatically.
+Below is an example of how two label pairs (`"environment": "prod"` and
+`"bananas": "apples"`) can be fetched from the master state endpoint.
+
+
+~~~{.sh}
+$ curl http://master/state.json
+...
+{
+  "executor_id": "default",
+  "framework_id": "20150312-120017-16777343-5050-39028-0000",
+  "id": "3",
+  "labels": [
+    {
+      "key": "environment",
+      "value": "prod"
+    },
+    {
+      "key": "bananas",
+      "value": "apples"
+    }
+  ],
+  "name": "Task 3",
+  "slave_id": "20150312-115625-16777343-5050-38751-S0",
+  "state": "TASK_FINISHED",
+  ...
+},
+~~~
+
 ## Service discovery
 
 When your framework registers an executor or launches a task, it can provide 
additional information for service discovery. This information is stored by the 
Mesos master along with other imporant information such as the slave currently 
running the task. A service discovery system can programmatically retrieve this 
information in order to set up DNS entries, configure proxies, or update any 
consistent store used for service discovery in a Mesos cluster that runs 
multiple frameworks and multiple tasks.

Modified: mesos/site/source/documentation/latest/committers.md
URL: 
http://svn.apache.org/viewvc/mesos/site/source/documentation/latest/committers.md?rev=1700176&r1=1700175&r2=1700176&view=diff
==============================================================================
--- mesos/site/source/documentation/latest/committers.md (original)
+++ mesos/site/source/documentation/latest/committers.md Sun Aug 30 23:41:46 
2015
@@ -241,7 +241,11 @@ When sending reviews, it can be valuable
     </tr>
     <tr>
       <td>Modules / Hooks</td>
-      <td>Niklas Nielsen, Benjamin Hindman</td>
+      <td>Benjamin Hindman, Niklas Nielsen</td>
+    </tr>
+    <tr>
+      <td>Oversubscription</td>
+      <td>Vinod Kone, Niklas Nielsen, Jie Yu</td>
     </tr>
     <tr>
       <td>CLI</td>

Modified: mesos/site/source/documentation/latest/docker-containerizer.md
URL: 
http://svn.apache.org/viewvc/mesos/site/source/documentation/latest/docker-containerizer.md?rev=1700176&r1=1700175&r2=1700176&view=diff
==============================================================================
--- mesos/site/source/documentation/latest/docker-containerizer.md (original)
+++ mesos/site/source/documentation/latest/docker-containerizer.md Sun Aug 30 
23:41:46 2015
@@ -18,6 +18,11 @@ Example: mesos-slave --containerizers=do
 
 Each slave that has the Docker containerizer should have Docker CLI client 
installed (version >= 1.0.0).
 
+If you enable iptables on slave, make sure the iptables allow all traffic from 
docker bridge interface through add below rule:
+```
+iptables -A INPUT -s 172.17.0.0/16 -i docker0 -p tcp -j ACCEPT
+```
+
 ## How do I use the Docker Containerizer?
 
 TaskInfo before 0.20.0 used to only support either setting a CommandInfo that 
launches a task running the bash command, or a ExecutorInfo that launches a 
custom Executor

Modified: mesos/site/source/documentation/latest/monitoring.md
URL: 
http://svn.apache.org/viewvc/mesos/site/source/documentation/latest/monitoring.md?rev=1700176&r1=1700175&r2=1700176&view=diff
==============================================================================
--- mesos/site/source/documentation/latest/monitoring.md (original)
+++ mesos/site/source/documentation/latest/monitoring.md Sun Aug 30 23:41:46 
2015
@@ -85,6 +85,27 @@ framework is misbehaving.
 </tr>
 <tr>
   <td>
+  <code>master/cpus_revocable_percent</code>
+  </td>
+  <td>Percentage of allocated revocable CPUs</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
+  <code>master/cpus_revocable_total</code>
+  </td>
+  <td>Number of revocable CPUs</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
+  <code>master/cpus_revocable_used</code>
+  </td>
+  <td>Number of allocated revocable CPUs</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
   <code>master/disk_percent</code>
   </td>
   <td>Percentage of allocated disk space</td>
@@ -106,6 +127,27 @@ framework is misbehaving.
 </tr>
 <tr>
   <td>
+  <code>master/disk_revocable_percent</code>
+  </td>
+  <td>Percentage of allocated revocable disk space</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
+  <code>master/disk_revocable_total</code>
+  </td>
+  <td>Revocable disk space in MB</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
+  <code>master/disk_revocable_used</code>
+  </td>
+  <td>Allocated revocable disk space in MB</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
   <code>master/mem_percent</code>
   </td>
   <td>Percentage of allocated memory</td>
@@ -125,6 +167,27 @@ framework is misbehaving.
   <td>Memory in MB</td>
   <td>Gauge</td>
 </tr>
+<tr>
+  <td>
+  <code>master/mem_revocable_percent</code>
+  </td>
+  <td>Percentage of allocated revocable memory</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
+  <code>master/mem_revocable_total</code>
+  </td>
+  <td>Revocable memory in MB</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
+  <code>master/mem_revocable_used</code>
+  </td>
+  <td>Allocated revocable memory in MB</td>
+  <td>Gauge</td>
+</tr>
 </table>
 
 #### Master
@@ -793,6 +856,27 @@ the slave and their current usage.
 </tr>
 <tr>
   <td>
+  <code>slave/cpus_revocable_percent</code>
+  </td>
+  <td>Percentage of allocated revocable CPUs</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
+  <code>slave/cpus_revocable_total</code>
+  </td>
+  <td>Number of revocable CPUs</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
+  <code>slave/cpus_revocable_used</code>
+  </td>
+  <td>Number of allocated revocable CPUs</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
   <code>slave/disk_percent</code>
   </td>
   <td>Percentage of allocated disk space</td>
@@ -821,6 +905,27 @@ the slave and their current usage.
 </tr>
 <tr>
   <td>
+  <code>slave/disk_revocable_percent</code>
+  </td>
+  <td>Percentage of allocated revocable disk space</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
+  <code>slave/disk_revocable_total</code>
+  </td>
+  <td>Revocable disk space in MB</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
+  <code>slave/disk_revocable_used</code>
+  </td>
+  <td>Allocated revocable disk space in MB</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
   <code>slave/mem_used</code>
   </td>
   <td>Allocated memory in MB</td>
@@ -833,6 +938,27 @@ the slave and their current usage.
   <td>Memory in MB</td>
   <td>Gauge</td>
 </tr>
+<tr>
+  <td>
+  <code>slave/mem_revocable_percent</code>
+  </td>
+  <td>Percentage of allocated revocable memory</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
+  <code>slave/mem_revocable_total</code>
+  </td>
+  <td>Revocable memory in MB</td>
+  <td>Gauge</td>
+</tr>
+<tr>
+  <td>
+  <code>slave/mem_revocable_used</code>
+  </td>
+  <td>Allocated revocable memory in MB</td>
+  <td>Gauge</td>
+</tr>
 </table>
 
 #### Slave

Modified: mesos/site/source/documentation/latest/powered-by-mesos.md
URL: 
http://svn.apache.org/viewvc/mesos/site/source/documentation/latest/powered-by-mesos.md?rev=1700176&r1=1700175&r2=1700176&view=diff
==============================================================================
--- mesos/site/source/documentation/latest/powered-by-mesos.md (original)
+++ mesos/site/source/documentation/latest/powered-by-mesos.md Sun Aug 30 
23:41:46 2015
@@ -62,6 +62,7 @@ layout: documentation
 * [Revisely](http://revise.ly)
 * [Sabre Labs](http://www.sabre.com)
 * [Sailthru](http://www.sailthru.com)
+* [Scrapinghub](http://www.scrapinghub.com)
 * [Sharethrough](http://www.sharethrough.com)
 * [Sigmoid Analytics](http://www.sigmoidanalytics.com/)
 * [SiQueries](https://siqueries.com)

Modified: mesos/site/source/documentation/latest/upgrades.md
URL: 
http://svn.apache.org/viewvc/mesos/site/source/documentation/latest/upgrades.md?rev=1700176&r1=1700175&r2=1700176&view=diff
==============================================================================
--- mesos/site/source/documentation/latest/upgrades.md (original)
+++ mesos/site/source/documentation/latest/upgrades.md Sun Aug 30 23:41:46 2015
@@ -6,6 +6,22 @@ layout: documentation
 
 This document serves as a guide for users who wish to upgrade an existing 
mesos cluster. Some versions require particular upgrade techniques when 
upgrading a running cluster. Some upgrades will have incompatible changes.
 
+## Upgrading from 0.23.x to 0.24.x
+
+**NOTE** Support for live upgrading a driver based scheduler to HTTP based 
(experimental) scheduler has been added.
+
+**NOTE** Master now publishes its information in ZooKeeper in JSON (instead of 
protobuf). Make sure schedulers are linked against >= 0.23.0 libmesos before 
upgrading the master.
+
+In order to upgrade a running cluster:
+
+* Rebuild and install any modules so that upgraded masters/slaves can use them.
+* Install the new master binaries and restart the masters.
+* Install the new slave binaries and restart the slaves.
+* Upgrade the schedulers by linking the latest native library / jar / egg (if 
necessary).
+* Restart the schedulers.
+* Upgrade the executors by linking the latest native library / jar / egg (if 
necessary).
+
+
 ## Upgrading from 0.22.x to 0.23.x
 
 **NOTE** The 'stats.json' endpoints for masters and slaves have been removed. 
Please use the 'metrics/snapshot' endpoints instead.


Reply via email to