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 2011/06/05 07:49:49 UTC
svn commit: r1131909 [1/5] - in /incubator/mesos/trunk: ./
frameworks/deploy_jar/ frameworks/hadoop-0.20.0/
frameworks/hadoop-0.20.0/bin/
frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/
frameworks/haproxy+apache/ frameworks/mpi/ framework...
Author: benh
Date: Sun Jun 5 05:49:41 2011
New Revision: 1131909
URL: http://svn.apache.org/viewvc?rev=1131909&view=rev
Log:
Renaming all instances of nexus to mesos. Accounted for all
capitalization.
Added:
incubator/mesos/trunk/frameworks/hadoop-0.20.0/bin/mesos-executor (with props)
incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MesosExecutor.java
- copied, changed from r1131908, incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/NexusExecutor.java
incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MesosScheduler.java
- copied, changed from r1131908, incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/NexusScheduler.java
incubator/mesos/trunk/frameworks/torque/mesos-hpl/
incubator/mesos/trunk/frameworks/torque/mesos-hpl/24node/
incubator/mesos/trunk/frameworks/torque/mesos-hpl/24node/HPL.dat
- copied, changed from r1131908, incubator/mesos/trunk/frameworks/torque/nexus-hpl/24node/HPL.dat
incubator/mesos/trunk/frameworks/torque/mesos-hpl/48node/
incubator/mesos/trunk/frameworks/torque/mesos-hpl/48node/HPL.dat
- copied, changed from r1131908, incubator/mesos/trunk/frameworks/torque/nexus-hpl/48node/HPL.dat
incubator/mesos/trunk/frameworks/torque/mesos-hpl/8node/
incubator/mesos/trunk/frameworks/torque/mesos-hpl/8node-small/
incubator/mesos/trunk/frameworks/torque/mesos-hpl/8node-small/HPL.dat
- copied, changed from r1131908, incubator/mesos/trunk/frameworks/torque/nexus-hpl/8node-small/HPL.dat
incubator/mesos/trunk/frameworks/torque/mesos-hpl/8node/HPL.dat
- copied, changed from r1131908, incubator/mesos/trunk/frameworks/torque/nexus-hpl/8node/HPL.dat
incubator/mesos/trunk/frameworks/torque/mesos-hpl/Make.Linux_PII_CBLAS
- copied, changed from r1131908, incubator/mesos/trunk/frameworks/torque/nexus-hpl/Make.Linux_PII_CBLAS
incubator/mesos/trunk/frameworks/torque/mesos-hpl/README
- copied, changed from r1131908, incubator/mesos/trunk/frameworks/torque/nexus-hpl/README
incubator/mesos/trunk/include/mesos.h
- copied, changed from r1131908, incubator/mesos/trunk/include/nexus.h
incubator/mesos/trunk/include/mesos.hpp
- copied, changed from r1131908, incubator/mesos/trunk/include/nexus.hpp
incubator/mesos/trunk/include/mesos_exec.h
incubator/mesos/trunk/include/mesos_exec.hpp
- copied, changed from r1131908, incubator/mesos/trunk/include/nexus_exec.hpp
incubator/mesos/trunk/include/mesos_sched.h
incubator/mesos/trunk/include/mesos_sched.hpp
- copied, changed from r1131908, incubator/mesos/trunk/include/nexus_sched.hpp
incubator/mesos/trunk/include/mesos_types.h
- copied, changed from r1131908, incubator/mesos/trunk/include/nexus_types.h
incubator/mesos/trunk/include/mesos_types.hpp
- copied, changed from r1131908, incubator/mesos/trunk/include/nexus_types.hpp
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/copy-dir
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/copy-dir
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/epilogue.kill-mpi-ring
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/epilogue.kill-mpi-ring
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/hadoop-framework-conf/
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/hadoop-framework-conf/core-site.xml
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/hadoop-framework-conf/core-site.xml
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/hadoop-framework-conf/hadoop-env.sh
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/hadoop-framework-conf/hadoop-env.sh
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/hadoop-framework-conf/mapred-site.xml
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/hadoop-framework-conf/mapred-site.xml
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/haproxy+apache/
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/haproxy+apache/haproxy.config.template
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/haproxy+apache/haproxy.config.template
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/master
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/master
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/mesos-daemon
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/nexus-daemon
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/prologue.setup-mpi-master
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/prologue.setup-mpi-master
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/redeploy-mesos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/redeploy-nexus
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/runaway-kill
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/runaway-kill
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/runaway-killall
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/runaway-killall
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/setup
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/setup-apache
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/setup-apache
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/setup-mpi
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-mpi
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/setup-slave
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-slave
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/setup-torque
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-torque
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/setup-torque-server
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-torque-server
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/slaves
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/slaves
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/ssh-no-keychecking
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/ssh-no-keychecking
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/start-mesos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/start-nexus
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/start-mos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/start-mos
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/start-torque-slaves
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/start-torque-slaves
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/stop-mesos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/stop-nexus
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/stop-mos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/stop-mos
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/stop-tasktracker-child
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/stop-tasktracker-child
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/stop-torque-slaves
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/stop-torque-slaves
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/mesos-ec2/zoo
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/zoo
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/copy-dir
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/copy-dir
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/hadoop-framework-conf/
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/hadoop-framework-conf/core-site.xml
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/hadoop-framework-conf/core-site.xml
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/hadoop-framework-conf/hadoop-env.sh
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/hadoop-framework-conf/hadoop-env.sh
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/hadoop-framework-conf/mapred-site.xml
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/hadoop-framework-conf/mapred-site.xml
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/haproxy+apache/
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/haproxy+apache/haproxy.config.template
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/haproxy+apache/haproxy.config.template
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/master
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/master
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/mesos-daemon
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/nexus-daemon
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/redeploy-mesos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/redeploy-nexus
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/runaway-kill
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/runaway-kill
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/runaway-killall
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/runaway-killall
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/setup
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/setup
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/setup-apache
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/setup-apache
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/setup-slave
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/setup-slave
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/setup-torque
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/setup-torque
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/slaves
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/slaves
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/ssh-no-keychecking
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/ssh-no-keychecking
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/start-mesos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/start-nexus
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/start-mos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/start-mos
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/stop-mesos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/stop-nexus
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/stop-mos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/stop-mos
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/mesos-ec2/stop-tasktracker-child
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/stop-tasktracker-child
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/hadoop-framework-conf/
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/hadoop-framework-conf/core-site.xml
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/hadoop-framework-conf/core-site.xml
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/hadoop-framework-conf/hadoop-env.sh
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/hadoop-framework-conf/hadoop-env.sh
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/hadoop-framework-conf/mapred-site.xml
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/hadoop-framework-conf/mapred-site.xml
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/haproxy+apache/
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/haproxy+apache/haproxy.config.template
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/haproxy+apache/haproxy.config.template
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/master
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/master
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/mesos-daemon
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/nexus-daemon
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/redeploy-mesos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/redeploy-nexus
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/runaway-kill
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/runaway-kill
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/runaway-killall
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/runaway-killall
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/setup
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/setup
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/setup-apache
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-apache
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/setup-slave
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/setup-slave
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/slaves
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/slaves
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/start-mesos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/start-nexus
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/start-mos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/start-mos
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/stop-mesos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/stop-nexus
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/stop-mos
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/stop-mos
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/stop-tasktracker-child
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/stop-tasktracker-child
incubator/mesos/trunk/src/ec2/deploy.solaris/root/mesos-ec2/zoo
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/zoo
incubator/mesos/trunk/src/ec2/mesos-ec2 (with props)
incubator/mesos/trunk/src/ec2/mesos_ec2.py
- copied, changed from r1131908, incubator/mesos/trunk/src/ec2/nexus_ec2.py
incubator/mesos/trunk/src/mesos_exec.cpp
- copied, changed from r1131908, incubator/mesos/trunk/src/nexus_exec.cpp
incubator/mesos/trunk/src/mesos_local.cpp
- copied, changed from r1131908, incubator/mesos/trunk/src/nexus_local.cpp
incubator/mesos/trunk/src/mesos_local.hpp
- copied, changed from r1131908, incubator/mesos/trunk/src/nexus_local.hpp
incubator/mesos/trunk/src/mesos_sched.cpp
- copied, changed from r1131908, incubator/mesos/trunk/src/nexus_sched.cpp
incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch1
- copied, changed from r1131908, incubator/mesos/trunk/src/swig/java/nexusJNI.java.patch1
incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch2
- copied, changed from r1131908, incubator/mesos/trunk/src/swig/java/nexusJNI.java.patch2
incubator/mesos/trunk/src/swig/mesos.i
- copied, changed from r1131908, incubator/mesos/trunk/src/swig/nexus.i
Removed:
incubator/mesos/trunk/frameworks/hadoop-0.20.0/bin/nexus-executor
incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/NexusExecutor.java
incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/NexusScheduler.java
incubator/mesos/trunk/frameworks/torque/nexus-hpl/24node/HPL.dat
incubator/mesos/trunk/frameworks/torque/nexus-hpl/48node/HPL.dat
incubator/mesos/trunk/frameworks/torque/nexus-hpl/8node-small/HPL.dat
incubator/mesos/trunk/frameworks/torque/nexus-hpl/8node/HPL.dat
incubator/mesos/trunk/frameworks/torque/nexus-hpl/Make.Linux_PII_CBLAS
incubator/mesos/trunk/frameworks/torque/nexus-hpl/README
incubator/mesos/trunk/include/nexus.h
incubator/mesos/trunk/include/nexus.hpp
incubator/mesos/trunk/include/nexus_exec.h
incubator/mesos/trunk/include/nexus_exec.hpp
incubator/mesos/trunk/include/nexus_sched.h
incubator/mesos/trunk/include/nexus_sched.hpp
incubator/mesos/trunk/include/nexus_types.h
incubator/mesos/trunk/include/nexus_types.hpp
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/copy-dir
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/epilogue.kill-mpi-ring
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/hadoop-framework-conf/core-site.xml
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/hadoop-framework-conf/hadoop-env.sh
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/hadoop-framework-conf/mapred-site.xml
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/haproxy+apache/haproxy.config.template
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/master
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/nexus-daemon
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/prologue.setup-mpi-master
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/redeploy-nexus
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/runaway-kill
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/runaway-killall
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-apache
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-mpi
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-slave
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-torque
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-torque-server
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/slaves
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/ssh-no-keychecking
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/start-mos
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/start-nexus
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/start-torque-slaves
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/stop-mos
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/stop-nexus
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/stop-tasktracker-child
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/stop-torque-slaves
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/zoo
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/copy-dir
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/hadoop-framework-conf/core-site.xml
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/hadoop-framework-conf/hadoop-env.sh
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/hadoop-framework-conf/mapred-site.xml
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/haproxy+apache/haproxy.config.template
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/master
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/nexus-daemon
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/redeploy-nexus
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/runaway-kill
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/runaway-killall
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/setup
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/setup-apache
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/setup-slave
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/setup-torque
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/slaves
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/ssh-no-keychecking
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/start-mos
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/start-nexus
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/stop-mos
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/stop-nexus
incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/stop-tasktracker-child
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/hadoop-framework-conf/core-site.xml
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/hadoop-framework-conf/hadoop-env.sh
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/hadoop-framework-conf/mapred-site.xml
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/haproxy+apache/haproxy.config.template
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/master
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/nexus-daemon
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/redeploy-nexus
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/runaway-kill
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/runaway-killall
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/setup
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/setup-apache
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/setup-slave
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/slaves
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/start-mos
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/start-nexus
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/stop-mos
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/stop-nexus
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/stop-tasktracker-child
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/zoo
incubator/mesos/trunk/src/ec2/nexus-ec2
incubator/mesos/trunk/src/ec2/nexus_ec2.py
incubator/mesos/trunk/src/nexus_exec.cpp
incubator/mesos/trunk/src/nexus_local.cpp
incubator/mesos/trunk/src/nexus_local.hpp
incubator/mesos/trunk/src/nexus_sched.cpp
incubator/mesos/trunk/src/swig/java/nexusJNI.java.patch1
incubator/mesos/trunk/src/swig/java/nexusJNI.java.patch2
incubator/mesos/trunk/src/swig/nexus.i
Modified:
incubator/mesos/trunk/.gitignore
incubator/mesos/trunk/Makefile.in
incubator/mesos/trunk/README
incubator/mesos/trunk/README.swig
incubator/mesos/trunk/configure
incubator/mesos/trunk/configure.OURS.rcluster
incubator/mesos/trunk/configure.ac
incubator/mesos/trunk/frameworks/deploy_jar/README.txt
incubator/mesos/trunk/frameworks/deploy_jar/daemon_executor.py
incubator/mesos/trunk/frameworks/deploy_jar/daemon_scheduler.py
incubator/mesos/trunk/frameworks/hadoop-0.20.0/bin/hadoop
incubator/mesos/trunk/frameworks/hadoop-0.20.0/build.xml
incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/JobTracker.java
incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MapOutputServer.java
incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
incubator/mesos/trunk/frameworks/haproxy+apache/README.txt
incubator/mesos/trunk/frameworks/haproxy+apache/haproxy+apache.py
incubator/mesos/trunk/frameworks/haproxy+apache/startapache.py
incubator/mesos/trunk/frameworks/mpi/README.txt
incubator/mesos/trunk/frameworks/mpi/nmpiexec.py
incubator/mesos/trunk/frameworks/mpi/startmpd.py
incubator/mesos/trunk/frameworks/torque/README.txt
incubator/mesos/trunk/frameworks/torque/start_pbs_mom.py
incubator/mesos/trunk/frameworks/torque/torquesched.py
incubator/mesos/trunk/src/Makefile.in
incubator/mesos/trunk/src/allocator.hpp
incubator/mesos/trunk/src/allocator_factory.cpp
incubator/mesos/trunk/src/allocator_factory.hpp
incubator/mesos/trunk/src/config.hpp.in
incubator/mesos/trunk/src/configurator.cpp
incubator/mesos/trunk/src/configurator.hpp
incubator/mesos/trunk/src/cpp_test_executor.cpp
incubator/mesos/trunk/src/cpp_test_framework.cpp
incubator/mesos/trunk/src/ec2/launch-torque-fw.sh
incubator/mesos/trunk/src/factory.hpp
incubator/mesos/trunk/src/gc.cpp
incubator/mesos/trunk/src/isolation_module.cpp
incubator/mesos/trunk/src/isolation_module.hpp
incubator/mesos/trunk/src/isolation_module_factory.cpp
incubator/mesos/trunk/src/isolation_module_factory.hpp
incubator/mesos/trunk/src/launcher.cpp
incubator/mesos/trunk/src/launcher.hpp
incubator/mesos/trunk/src/launcher_main.cpp
incubator/mesos/trunk/src/local.cpp
incubator/mesos/trunk/src/lock.cpp
incubator/mesos/trunk/src/lock.hpp
incubator/mesos/trunk/src/logging.cpp
incubator/mesos/trunk/src/logging.hpp
incubator/mesos/trunk/src/lr.cpp
incubator/mesos/trunk/src/lr_exec.cpp
incubator/mesos/trunk/src/lxc_isolation_module.cpp
incubator/mesos/trunk/src/lxc_isolation_module.hpp
incubator/mesos/trunk/src/master.cpp
incubator/mesos/trunk/src/master.hpp
incubator/mesos/trunk/src/master_detector.cpp
incubator/mesos/trunk/src/master_detector.hpp
incubator/mesos/trunk/src/master_main.cpp
incubator/mesos/trunk/src/master_state.hpp
incubator/mesos/trunk/src/master_webui.cpp
incubator/mesos/trunk/src/master_webui.hpp
incubator/mesos/trunk/src/memhog.cpp
incubator/mesos/trunk/src/memhog_executor.cpp
incubator/mesos/trunk/src/messages.cpp
incubator/mesos/trunk/src/messages.hpp
incubator/mesos/trunk/src/option.hpp
incubator/mesos/trunk/src/params.cpp
incubator/mesos/trunk/src/params.hpp
incubator/mesos/trunk/src/process_based_isolation_module.cpp
incubator/mesos/trunk/src/process_based_isolation_module.hpp
incubator/mesos/trunk/src/projd.cpp
incubator/mesos/trunk/src/resources.hpp
incubator/mesos/trunk/src/scaling/nested_exec.py
incubator/mesos/trunk/src/scaling/scaling_exec.py
incubator/mesos/trunk/src/scaling/scaling_sched.py
incubator/mesos/trunk/src/scheduled_memhog.cpp
incubator/mesos/trunk/src/simple_allocator.cpp
incubator/mesos/trunk/src/simple_allocator.hpp
incubator/mesos/trunk/src/slave.cpp
incubator/mesos/trunk/src/slave.hpp
incubator/mesos/trunk/src/slave_main.cpp
incubator/mesos/trunk/src/slave_state.hpp
incubator/mesos/trunk/src/slave_webui.cpp
incubator/mesos/trunk/src/slave_webui.hpp
incubator/mesos/trunk/src/solaris_project_isolation_module.cpp
incubator/mesos/trunk/src/solaris_project_isolation_module.hpp
incubator/mesos/trunk/src/string_utils.cpp
incubator/mesos/trunk/src/string_utils.hpp
incubator/mesos/trunk/src/swig/java/TestExceptionExecutor.java
incubator/mesos/trunk/src/swig/java/TestExceptionFramework.java
incubator/mesos/trunk/src/swig/java/TestExecutor.java
incubator/mesos/trunk/src/swig/java/TestFramework.java
incubator/mesos/trunk/src/swig/java/test_exception_framework
incubator/mesos/trunk/src/swig/java/test_executor
incubator/mesos/trunk/src/swig/java/test_framework
incubator/mesos/trunk/src/swig/python/test_exec.py
incubator/mesos/trunk/src/swig/python/test_framework.py
incubator/mesos/trunk/src/swig/ruby/test_framework.rb
incubator/mesos/trunk/src/task.hpp
incubator/mesos/trunk/src/test_exec.cpp
incubator/mesos/trunk/src/test_framework.cpp
incubator/mesos/trunk/src/tests/external/LxcIsolation/run_scheduled_memhog_test.sh
incubator/mesos/trunk/src/tests/external_test.cpp
incubator/mesos/trunk/src/tests/external_test.hpp
incubator/mesos/trunk/src/tests/main.cpp
incubator/mesos/trunk/src/tests/test_configurator.cpp
incubator/mesos/trunk/src/tests/test_master.cpp
incubator/mesos/trunk/src/tests/test_resources.cpp
incubator/mesos/trunk/src/tests/test_string_utils.cpp
incubator/mesos/trunk/src/tests/testing_utils.cpp
incubator/mesos/trunk/src/tests/testing_utils.hpp
incubator/mesos/trunk/src/third_party/libprocess/tuple-process.hpp
incubator/mesos/trunk/src/url_processor.cpp
incubator/mesos/trunk/src/url_processor.hpp
incubator/mesos/trunk/src/webui/common/webui_lib.py
incubator/mesos/trunk/src/webui/master/index.tpl
incubator/mesos/trunk/src/webui/master/swig/master.i
incubator/mesos/trunk/src/webui/master/webui.py
incubator/mesos/trunk/src/webui/slave/index.tpl
incubator/mesos/trunk/src/webui/slave/swig/slave.i
incubator/mesos/trunk/src/webui/slave/webui.py
incubator/mesos/trunk/tests/simple/simple_exec.c
Modified: incubator/mesos/trunk/.gitignore
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/.gitignore?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/.gitignore (original)
+++ incubator/mesos/trunk/.gitignore Sun Jun 5 05:49:41 2011
@@ -25,11 +25,11 @@ Makefile
config.log
config.status
src/work
-nexus_wrap.cpp
-nexus_wrap.h
+mesos_wrap.cpp
+mesos_wrap.h
src/config.hpp
!src/config.hpp.in
-src/swig/java/nexus.jar
+src/swig/java/mesos.jar
src/webui/master/swig/master.py
src/webui/master/swig/master_wrap.cpp
src/webui/master/swig/master_wrap.h
@@ -69,16 +69,16 @@ src/third_party/zookeeper-3.3.1/src/c/st
src/alltests
src/cpp-test-executor
src/cpp-test-framework
-src/nexus-local
-src/nexus-master
-src/nexus-slave
-src/nexus-projd
-src/nexus-launcher
+src/mesos-local
+src/mesos-master
+src/mesos-slave
+src/mesos-projd
+src/mesos-launcher
src/memhog
src/memhog-executor
src/test-framework
src/test-executor
src/scheduled-memhog
-src/swig/java/nexus
-src/swig/python/nexus.py
+src/swig/java/mesos
+src/swig/python/mesos.py
src/test_output
Modified: incubator/mesos/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/Makefile.in?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/Makefile.in (original)
+++ incubator/mesos/trunk/Makefile.in Sun Jun 5 05:49:41 2011
@@ -1,6 +1,6 @@
# Makefile.
-NEXUS_HOME = @prefix@/nexus
+MESOS_HOME = @prefix@/mesos
SHELL = '/bin/sh'
default: all
@@ -9,20 +9,20 @@ src:
$(MAKE) -C src
install:
- if test ! -d $(NEXUS_HOME); \
- then mkdir $(NEXUS_HOME); \
+ if test ! -d $(MESOS_HOME); \
+ then mkdir $(MESOS_HOME); \
fi
- if test ! -d $(NEXUS_HOME); \
- then mkdir $(NEXUS_HOME); \
+ if test ! -d $(MESOS_HOME); \
+ then mkdir $(MESOS_HOME); \
fi
- install -m 755 src/nexus-master $(NEXUS_HOME)
- install -m 755 src/nexus-slave $(NEXUS_HOME)
- install -m 755 src/swig/java/libnexus.so $(NEXUS_HOME)
- rsync -avz src/webui $(NEXUS_HOME)
- if test ! -d $(NEXUS_HOME)/third_party; \
- then mkdir $(NEXUS_HOME)/third_party; \
+ install -m 755 src/mesos-master $(MESOS_HOME)
+ install -m 755 src/mesos-slave $(MESOS_HOME)
+ install -m 755 src/swig/java/libmesos.so $(MESOS_HOME)
+ rsync -avz src/webui $(MESOS_HOME)
+ if test ! -d $(MESOS_HOME)/third_party; \
+ then mkdir $(MESOS_HOME)/third_party; \
fi
- rsync -avz src/third_party/bottle-0.5.6 $(NEXUS_HOME)/third_party
+ rsync -avz src/third_party/bottle-0.5.6 $(MESOS_HOME)/third_party
uninstall:
$(error unimplemented)
Modified: incubator/mesos/trunk/README
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/README?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/README (original)
+++ incubator/mesos/trunk/README Sun Jun 5 05:49:41 2011
@@ -1,29 +1,29 @@
-h1. Nexus Quickstart
+h1. Mesos Quickstart
-For now, you can run Nexus in linux. Those who develop on OS X are currently using a linux virtual machine for development.
+For now, you can run Mesos in linux. Those who develop on OS X are currently using a linux virtual machine for development.
-h2. Configure Nexus settings (future)
+h2. Configure Mesos settings (future)
-# Nexus does not currently use configuration files beyond the customary UNIX _configure_/_make_ process, but we plan on adding this, where one can specify things such as:
+# Mesos does not currently use configuration files beyond the customary UNIX _configure_/_make_ process, but we plan on adding this, where one can specify things such as:
## log file locations
## specify pluggable components (such as allocation module, isolation module, etc.)
-h2. Building Nexus
+h2. Building Mesos
-# in linux or solaris (OS X not currently supported), in the @NEXUS_HOME@ directory, if you are using a 64bit ubuntu VM, type @./configure.OURS.ubuntu64@
+# in linux or solaris (OS X not currently supported), in the @MESOS_HOME@ directory, if you are using a 64bit ubuntu VM, type @./configure.OURS.ubuntu64@
## our premade config commands require you to have python-dev, ruby-dev, sun-java6-jdk, and swig (to get these in ubuntu, type apt-get X, where X is those three things in turn)
# type @make@
h2. Running the master
-# type @./nexus-master@. See the sample output below.
+# type @./mesos-master@. See the sample output below.
# take note of the libprocess PID identifier that is printed to stdout (or the log file if you have redirected log output), it will be something like: 1@127.0.1.1:41210
# access the webui. E.g. on OS X with a Linux virtual machine, you can visit http://<ip addr of virtual machine>:8080
<pre>
-andyk@ubuntu:~/nexus/src$ ./nexus-master
+andyk@ubuntu:~/mesos/src$ ./mesos-master
I1229 15:50:36.042454 27343 master_main.cpp:51] Build: 2009-12-29 15:35:23 by andyk
-I1229 15:50:36.043526 27343 master_main.cpp:52] Starting Nexus master
+I1229 15:50:36.043526 27343 master_main.cpp:52] Starting Mesos master
I1229 15:50:36.044958 27344 master.cpp:228] Master started at 1@127.0.1.1:41210
I1229 15:50:36.045361 27343 master_webui.cpp:42] Starting master web UI
I1229 15:50:36.046046 27346 master_webui.cpp:25] Web UI thread started
@@ -38,11 +38,11 @@ I1229 15:50:38.059840 27344 master.cpp:5
...
</pre>
-!http://scm.millennium.berkeley.edu:3000/attachments/download/7/Nexus-webui-screenshot.png!
+!http://scm.millennium.berkeley.edu:3000/attachments/download/7/Mesos-webui-screenshot.png!
h2. Running the slave
-# type @./nexus-slave@ without arguments to see the required and optional arguments
+# type @./mesos-slave@ without arguments to see the required and optional arguments
# You should be able to see the slave show up on the master's webui
h3. Start a framework
Modified: incubator/mesos/trunk/README.swig
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/README.swig?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/README.swig (original)
+++ incubator/mesos/trunk/README.swig Sun Jun 5 05:49:41 2011
@@ -1,4 +1,4 @@
-To build the Java, Python and Ruby libraries for Nexus, you need to pass the following arguments to configure, respectively:
+To build the Java, Python and Ruby libraries for Mesos, you need to pass the following arguments to configure, respectively:
--with-java-home=<path to Java Development Kit install directory>
--with-python-headers=<path to Python headers>
--with-ruby-headers=<path to Ruby headers>
@@ -15,12 +15,12 @@ Development Kit package is sun-java6-jdk
Finally, to run executors written in one of these languages, you will need
to properly set up the include paths for each one. The easiest way right
-now is to create a shell script as your executor that you place in src/nexus,
+now is to create a shell script as your executor that you place in src/mesos,
and have this script set language-specific paths and run your code.
For example, for a Python executor exec.py, your script might look like:
#!/bin/sh
-PYTHONPATH=<nexus_home>/src/swig/python
+PYTHONPATH=<mesos_home>/src/swig/python
exec python <absolute_path>/exec.py
In Java, you would need to set the CLASSPATH and the Java library path (with LD_LIBRARY_PATH or -Djava.library.path). In Ruby, use the -I option.
Modified: incubator/mesos/trunk/configure
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/configure (original)
+++ incubator/mesos/trunk/configure Sun Jun 5 05:49:41 2011
@@ -1956,7 +1956,7 @@ test -n "$target_alias" &&
program_prefix=${target_alias}-
-UNSUPPORTED_OS="Nexus is currently unsupported on your platform."
+UNSUPPORTED_OS="Mesos is currently unsupported on your platform."
case "${target_os}" in
linux*)
Modified: incubator/mesos/trunk/configure.OURS.rcluster
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.OURS.rcluster?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.OURS.rcluster (original)
+++ incubator/mesos/trunk/configure.OURS.rcluster Sun Jun 5 05:49:41 2011
@@ -1,2 +1,2 @@
#!/bin/sh
-./configure --with-python-headers=/usr/include/python2.5 --with-ruby-headers=/usr/lib/ruby/1.8/x86_64-linux --with-java-home=/usr/lib/jvm/java-6-sun --with-boost-headers=/work/nexus/boost/include --with-local-zookeeper --with-webui $@
+./configure --with-python-headers=/usr/include/python2.5 --with-ruby-headers=/usr/lib/ruby/1.8/x86_64-linux --with-java-home=/usr/lib/jvm/java-6-sun --with-boost-headers=/work/mesos/boost/include --with-local-zookeeper --with-webui $@
Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Sun Jun 5 05:49:41 2011
@@ -30,7 +30,7 @@ AC_CONFIG_SUBDIRS([src/third_party/zooke
AC_CANONICAL_SYSTEM
-UNSUPPORTED_OS="Nexus is currently unsupported on your platform."
+UNSUPPORTED_OS="Mesos is currently unsupported on your platform."
case "${target_os}" in
linux*)
Modified: incubator/mesos/trunk/frameworks/deploy_jar/README.txt
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/deploy_jar/README.txt?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/deploy_jar/README.txt (original)
+++ incubator/mesos/trunk/frameworks/deploy_jar/README.txt Sun Jun 5 05:49:41 2011
@@ -1,4 +1,4 @@
-haproxy load balancer + Apache web server Nexus framework Readme
+haproxy load balancer + Apache web server Mesos framework Readme
----------------------------------------------------------------
First you will need to be able to run apache on the slave nodes in your cluster.
Modified: incubator/mesos/trunk/frameworks/deploy_jar/daemon_executor.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/deploy_jar/daemon_executor.py?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/deploy_jar/daemon_executor.py (original)
+++ incubator/mesos/trunk/frameworks/deploy_jar/daemon_executor.py Sun Jun 5 05:49:41 2011
@@ -1,14 +1,14 @@
#!/usr/bin/env python
-import nexus
+import mesos
import sys
import time
import os
from subprocess import *
-class MyExecutor(nexus.Executor):
+class MyExecutor(mesos.Executor):
def __init__(self):
- nexus.Executor.__init__(self)
+ mesos.Executor.__init__(self)
def init(self, driver, arg):
print "in daemon executor"
@@ -20,7 +20,7 @@ class MyExecutor(nexus.Executor):
self.args = task.arg.split("\t")
print "running: " + "java -cp " + self.args[0] + " " + self.args[1] + " " + self.args[2]
print Popen("/usr/lib/jvm/java-6-sun/bin/java -cp " + self.args[0] + " " + self.args[1] + " " + self.args[2], shell=True, stdout=PIPE).stdout.readline()
- update = nexus.TaskStatus(task.taskId, nexus.TASK_FINISHED, "")
+ update = mesos.TaskStatus(task.taskId, mesos.TASK_FINISHED, "")
driver.sendStatusUpdate(update)
@@ -30,4 +30,4 @@ class MyExecutor(nexus.Executor):
if __name__ == "__main__":
print "starting daemon framework executor"
executor = MyExecutor()
- nexus.NexusExecutorDriver(executor).run()
+ mesos.MesosExecutorDriver(executor).run()
Modified: incubator/mesos/trunk/frameworks/deploy_jar/daemon_scheduler.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/deploy_jar/daemon_scheduler.py?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/deploy_jar/daemon_scheduler.py (original)
+++ incubator/mesos/trunk/frameworks/deploy_jar/daemon_scheduler.py Sun Jun 5 05:49:41 2011
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-import nexus
+import mesos
import os
import sys
import time
@@ -16,11 +16,11 @@ MIN_SERVERS = 1
START_THRESHOLD = 25
KILL_THRESHOLD = 5
#HAPROXY_EXE = "/root/haproxy-1.3.20/haproxy"
-HAPROXY_EXE = "/home/andyk/nexus/frameworks/haproxy+apache/haproxy-1.3.20/haproxy"
+HAPROXY_EXE = "/home/andyk/mesos/frameworks/haproxy+apache/haproxy-1.3.20/haproxy"
-class MyScheduler(nexus.Scheduler):
+class MyScheduler(mesos.Scheduler):
def __init__(self, num_tasks, jar_url, jar_class, jar_args):
- nexus.Scheduler.__init__(self)
+ mesos.Scheduler.__init__(self)
self.lock = threading.RLock()
self.id = 0
self.haproxy = -1
@@ -59,10 +59,10 @@ class MyScheduler(nexus.Scheduler):
def getExecutorInfo(self, driver):
execPath = os.path.join(os.getcwd(), "daemon_executor.sh")
- return nexus.ExecutorInfo(execPath, "")
+ return mesos.ExecutorInfo(execPath, "")
def registered(self, driver, fid):
- print "Nexus daemon scheduler registered as framework #%s" % fid
+ print "Mesos daemon scheduler registered as framework #%s" % fid
def resourceOffer(self, driver, oid, slave_offers):
print "Got slot offer %d" % oid
@@ -74,7 +74,7 @@ class MyScheduler(nexus.Scheduler):
params = {"cpus": "1", "mem": "1073741824"}
task_args = self.jar_url + "\t" + self.jar_class + "\t" + self.jar_args
print "task args are: " + task_args
- td = nexus.TaskDescription(
+ td = mesos.TaskDescription(
self.task_count, offer.slaveId, "task %d" % self.task_count, params, task_args)
tasks.append(td)
print "incrementing self.task_count from " + str(self.task_count)
@@ -89,7 +89,7 @@ class MyScheduler(nexus.Scheduler):
#def statusUpdate(self, driver, status):
# self.lock.acquire()
# if status.taskId in self.servers.keys():
- # if status.state == nexus.TASK_FINISHED:
+ # if status.state == mesos.TASK_FINISHED:
# del self.servers[status.taskId]
# self.reconfigure()
# reconfigured = True
@@ -168,8 +168,8 @@ if __name__ == "__main__":
#threading.Thread(target = monitor, args=[sched]).start()
- print "Connecting to nexus master %s" % args[0]
+ print "Connecting to mesos master %s" % args[0]
- nexus.NexusSchedulerDriver(sched, sys.argv[1]).run()
+ mesos.MesosSchedulerDriver(sched, sys.argv[1]).run()
print "Finished!"
Modified: incubator/mesos/trunk/frameworks/hadoop-0.20.0/bin/hadoop
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/hadoop-0.20.0/bin/hadoop?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/hadoop-0.20.0/bin/hadoop (original)
+++ incubator/mesos/trunk/frameworks/hadoop-0.20.0/bin/hadoop Sun Jun 5 05:49:41 2011
@@ -160,8 +160,8 @@ for f in $HADOOP_HOME/build/hadoop-*-too
TOOL_PATH=${TOOL_PATH}:$f;
done
-# add Nexus to classpath
-CLASSPATH=${CLASSPATH}:${HADOOP_HOME}/../../src/swig/java/nexus.jar
+# add Mesos to classpath
+CLASSPATH=${CLASSPATH}:${HADOOP_HOME}/../../src/swig/java/mesos.jar
# add user-specified CLASSPATH last
if [ "$HADOOP_CLASSPATH" != "" ]; then
@@ -273,7 +273,7 @@ if [ -d "${HADOOP_HOME}/build/native" -o
fi
fi
-# add Nexus to JAVA_LIBRARY_PATH
+# add Mesos to JAVA_LIBRARY_PATH
if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:${HADOOP_HOME}/../../src/swig/java
else
Added: incubator/mesos/trunk/frameworks/hadoop-0.20.0/bin/mesos-executor
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/hadoop-0.20.0/bin/mesos-executor?rev=1131909&view=auto
==============================================================================
--- incubator/mesos/trunk/frameworks/hadoop-0.20.0/bin/mesos-executor (added)
+++ incubator/mesos/trunk/frameworks/hadoop-0.20.0/bin/mesos-executor Sun Jun 5 05:49:41 2011
@@ -0,0 +1,4 @@
+#!/bin/sh
+COMMAND="`dirname $0`/hadoop org.apache.hadoop.mapred.MesosExecutor"
+echo Running $COMMAND
+exec $COMMAND
Propchange: incubator/mesos/trunk/frameworks/hadoop-0.20.0/bin/mesos-executor
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/mesos/trunk/frameworks/hadoop-0.20.0/build.xml
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/hadoop-0.20.0/build.xml?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/hadoop-0.20.0/build.xml (original)
+++ incubator/mesos/trunk/frameworks/hadoop-0.20.0/build.xml Sun Jun 5 05:49:41 2011
@@ -195,7 +195,7 @@
<exclude name="**/excluded/" />
</fileset>
<pathelement location="${conf.dir}"/>
- <pathelement location="${basedir}/../../src/swig/java/nexus.jar"/>
+ <pathelement location="${basedir}/../../src/swig/java/mesos.jar"/>
<path refid="ivy-common.classpath"/>
</path>
Modified: incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/JobTracker.java (original)
+++ incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/JobTracker.java Sun Jun 5 05:49:41 2011
@@ -1479,8 +1479,8 @@ public class JobTracker implements MRCon
private QueueManager queueManager;
- private boolean useNexus;
- private NexusScheduler nexusScheduler;
+ private boolean useMesos;
+ private MesosScheduler mesosScheduler;
/**
* Start the JobTracker process, listen on the indicated port
@@ -1508,11 +1508,11 @@ public class JobTracker implements MRCon
this.conf = conf;
JobConf jobConf = new JobConf(conf);
- // If using Nexus
- useNexus = conf.getBoolean("mapred.use.nexus", false);
- LOG.info("useNexus = " + useNexus);
+ // If using Mesos
+ useMesos = conf.getBoolean("mapred.use.mesos", false);
+ LOG.info("useMesos = " + useMesos);
- if (useNexus) {
+ if (useMesos) {
this.conf.set("mapred.job.tracker", "localhost:0");
this.conf.set("mapred.job.tracker.http.address", "0.0.0.0:0");
}
@@ -1704,19 +1704,19 @@ public class JobTracker implements MRCon
//initializes the job status store
completedJobStatusStore = new CompletedJobStatusStore(conf,fs);
- if (useNexus) {
- connectToNexus();
+ if (useMesos) {
+ connectToMesos();
}
}
- private void connectToNexus() throws IOException {
- System.loadLibrary("nexus");
- final String master = conf.get("mapred.nexus.master", "local");
- nexusScheduler = new NexusScheduler(this);
- new Thread("Nexus scheduler") {
+ private void connectToMesos() throws IOException {
+ System.loadLibrary("mesos");
+ final String master = conf.get("mapred.mesos.master", "local");
+ mesosScheduler = new MesosScheduler(this);
+ new Thread("Mesos scheduler") {
@Override
public void run() {
- nexusScheduler.run(master);
+ mesosScheduler.run(master);
}
}.start();
}
Modified: incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MapOutputServer.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MapOutputServer.java?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MapOutputServer.java (original)
+++ incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MapOutputServer.java Sun Jun 5 05:49:41 2011
@@ -183,7 +183,7 @@ public class MapOutputServer implements
StringUtils.stringifyException(ie));
if (isInputException) {
System.out.println("******************************************");
- System.out.print("NEXUS PORT DOES NOT HANDLE THIS ERROR!");
+ System.out.print("MESOS PORT DOES NOT HANDLE THIS ERROR!");
System.out.println("******************************************");
//tracker.mapOutputLost(TaskAttemptID.forName(mapId), errorMsg);
}
Copied: incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MesosExecutor.java (from r1131908, incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/NexusExecutor.java)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MesosExecutor.java?p2=incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MesosExecutor.java&p1=incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/NexusExecutor.java&r1=1131908&r2=1131909&rev=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/NexusExecutor.java (original)
+++ incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MesosExecutor.java Sun Jun 5 05:49:41 2011
@@ -19,18 +19,18 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.io.ObjectWritable;
import org.apache.hadoop.mapred.TaskStatus.State;
-import nexus.Executor;
-import nexus.ExecutorArgs;
-import nexus.ExecutorDriver;
-import nexus.FrameworkMessage;
-import nexus.NexusExecutorDriver;
-import nexus.TaskDescription;
-import nexus.TaskState;
+import mesos.Executor;
+import mesos.ExecutorArgs;
+import mesos.ExecutorDriver;
+import mesos.FrameworkMessage;
+import mesos.MesosExecutorDriver;
+import mesos.TaskDescription;
+import mesos.TaskState;
-public class NexusExecutor extends Executor
+public class MesosExecutor extends Executor
implements InterTrackerProtocol {
public static final Log LOG =
- LogFactory.getLog(NexusExecutor.class);
+ LogFactory.getLog(MesosExecutor.class);
private JobConf conf;
private TaskTracker taskTracker;
@@ -45,20 +45,20 @@ public class NexusExecutor extends Execu
private List<UnmappedTask> unmappedMaps = new LinkedList<UnmappedTask>();
private List<UnmappedTask> unmappedReduces = new LinkedList<UnmappedTask>();
- private Map<TaskAttemptID, Integer> hadoopIdToNexusId =
+ private Map<TaskAttemptID, Integer> hadoopIdToMesosId =
new HashMap<TaskAttemptID, Integer>();
- private Map<Integer, TaskAttemptID> nexusIdToHadoopId =
+ private Map<Integer, TaskAttemptID> mesosIdToHadoopId =
new HashMap<Integer, TaskAttemptID>();
private State state;
/**
- * Represents a Nexus task that was launched but has not yet been mapped
+ * Represents a Mesos task that was launched but has not yet been mapped
* to a Hadoop task. That is, we have acquired a slot for this task but
* have not yet assigned it a map or reduce. We keep such tasks around
- * for a limited time (mapred.nexus.unmapped.task.lifetime) and then give
+ * for a limited time (mapred.mesos.unmapped.task.lifetime) and then give
* them up because they can arise from "mistakes" in accepting slot offers
* (e.g. we thought we needed a new slot but then we didn't). To ensure
- * high utilization, we don't want to waste Nexus slots on unmapped tasks.
+ * high utilization, we don't want to waste Mesos slots on unmapped tasks.
*/
private static class UnmappedTask {
int taskId;
@@ -100,7 +100,7 @@ public class NexusExecutor extends Execu
* after it calls expireUnmappedTasks().
*/
private void expireUnmappedTasks() {
- List<nexus.TaskStatus> updates = new ArrayList<nexus.TaskStatus>();
+ List<mesos.TaskStatus> updates = new ArrayList<mesos.TaskStatus>();
synchronized (this) {
long time = System.currentTimeMillis();
long unmappedTaskLifetime = 2 * taskTracker.heartbeatInterval;
@@ -112,7 +112,7 @@ public class NexusExecutor extends Execu
UnmappedTask task = it.next();
int taskId = task.taskId;
if (time - task.creationTime > unmappedTaskLifetime) {
- // Remove the task and report it to Nexus as LOST
+ // Remove the task and report it to Mesos as LOST
LOG.info("Removing expired unmapped task " + taskId);
it.remove();
if (list == unmappedMaps) {
@@ -121,12 +121,12 @@ public class NexusExecutor extends Execu
taskTracker.reduceSlots--;
}
updates.add(
- new nexus.TaskStatus(taskId, TaskState.TASK_LOST, new byte[0]));
+ new mesos.TaskStatus(taskId, TaskState.TASK_LOST, new byte[0]));
}
}
}
}
- for (nexus.TaskStatus update: updates) {
+ for (mesos.TaskStatus update: updates) {
driver.sendStatusUpdate(update);
}
}
@@ -134,7 +134,7 @@ public class NexusExecutor extends Execu
@Override
public void killTask(ExecutorDriver d, int taskId) {
synchronized (this) {
- TaskAttemptID hadoopId = nexusIdToHadoopId.get(taskId);
+ TaskAttemptID hadoopId = mesosIdToHadoopId.get(taskId);
taskTracker.killTask(hadoopId);
}
}
@@ -292,12 +292,12 @@ public class NexusExecutor extends Execu
expireUnmappedTasks();
// Look through statuses to see whether we have finished, failed or
- // killed any tasks. If so, notify Nexus through a status update and
+ // killed any tasks. If so, notify Mesos through a status update and
// decrease the slot counts on the tracker.
// We add the status updates to a list and make sure to send it without
- // the NexusExecutor lock held so that we don't deadlock with the C++
+ // the MesosExecutor lock held so that we don't deadlock with the C++
// code, which is calling into Java while holding the C++ scheduler lock.
- List<nexus.TaskStatus> updates = new ArrayList<nexus.TaskStatus>();
+ List<mesos.TaskStatus> updates = new ArrayList<mesos.TaskStatus>();
synchronized (this) {
for (TaskStatus taskStatus: status.getTaskReports()) {
state = taskStatus.getRunState();
@@ -307,7 +307,7 @@ public class NexusExecutor extends Execu
}
}
}
- for (nexus.TaskStatus update: updates) {
+ for (mesos.TaskStatus update: updates) {
if (update != null) {
driver.sendStatusUpdate(update);
}
@@ -324,8 +324,8 @@ public class NexusExecutor extends Execu
status, restarted, initialContact, acceptNewTasks, responseId);
// Look through the response actions to see whether there are any
- // tasks to launch. If so, give them some Nexus task IDs so they can
- // later be identified and killed by Nexus.
+ // tasks to launch. If so, give them some Mesos task IDs so they can
+ // later be identified and killed by Mesos.
if (response != null && response.getActions() != null) {
synchronized (this) {
for (TaskTrackerAction action: response.getActions()) {
@@ -333,27 +333,27 @@ public class NexusExecutor extends Execu
LaunchTaskAction lta = (LaunchTaskAction) action;
Task task = lta.getTask();
TaskAttemptID hadoopId = task.getTaskID();
- Integer nexusId;
+ Integer mesosId;
if (task.isMapTask()) {
if (unmappedMaps.isEmpty()) {
// This shouldn't happen due to the way we clean up
// unmapped tasks, but check for it.
throw new Exception("Launched Hadoop map task without "
- + "having a corresponding Nexus task!");
+ + "having a corresponding Mesos task!");
}
- nexusId = unmappedMaps.remove(0).taskId;
+ mesosId = unmappedMaps.remove(0).taskId;
} else {
if (unmappedReduces.isEmpty()) {
// This shouldn't happen due to the way we clean up
// unmapped tasks, but check for it.
throw new Exception("Launched Hadoop reduce task without "
- + "having a corresponding Nexus task!");
+ + "having a corresponding Mesos task!");
}
- nexusId = unmappedReduces.remove(0).taskId;
+ mesosId = unmappedReduces.remove(0).taskId;
}
- LOG.info("Mapping " + hadoopId + " to " + nexusId);
- hadoopIdToNexusId.put(hadoopId, nexusId);
- nexusIdToHadoopId.put(nexusId, hadoopId);
+ LOG.info("Mapping " + hadoopId + " to " + mesosId);
+ hadoopIdToMesosId.put(hadoopId, mesosId);
+ mesosIdToHadoopId.put(mesosId, hadoopId);
}
}
}
@@ -391,20 +391,20 @@ public class NexusExecutor extends Execu
}
}
- public synchronized nexus.TaskStatus createTaskDoneUpdate(
+ public synchronized mesos.TaskStatus createTaskDoneUpdate(
TaskStatus taskStatus) {
TaskAttemptID hadoopId = taskStatus.getTaskID();
- if (hadoopIdToNexusId.containsKey(hadoopId)) {
- Integer nexusId = hadoopIdToNexusId.get(hadoopId);
- TaskState nexusState;
+ if (hadoopIdToMesosId.containsKey(hadoopId)) {
+ Integer mesosId = hadoopIdToMesosId.get(hadoopId);
+ TaskState mesosState;
if (state == TaskStatus.State.SUCCEEDED ||
state == TaskStatus.State.COMMIT_PENDING) {
- nexusState = TaskState.TASK_FINISHED;
+ mesosState = TaskState.TASK_FINISHED;
} else if (state == TaskStatus.State.FAILED ||
state == TaskStatus.State.FAILED_UNCLEAN) {
- nexusState = TaskState.TASK_FAILED;
+ mesosState = TaskState.TASK_FAILED;
} else { // state == KILLED or KILLED_UNCLEAN
- nexusState = TaskState.TASK_KILLED;
+ mesosState = TaskState.TASK_KILLED;
}
if (taskStatus.getIsMap()) {
@@ -413,16 +413,16 @@ public class NexusExecutor extends Execu
taskTracker.reduceSlots--;
}
- nexus.TaskStatus update =
- new nexus.TaskStatus(nexusId, nexusState, new byte[0]);
+ mesos.TaskStatus update =
+ new mesos.TaskStatus(mesosId, mesosState, new byte[0]);
- // Remove from hadoopIdToNexusId and nexusIdToHadoopId.
+ // Remove from hadoopIdToMesosId and mesosIdToHadoopId.
// This will prevent us from sending a duplicate status update
- // about this task to Nexus in the future.
- hadoopIdToNexusId.remove(hadoopId);
- nexusIdToHadoopId.remove(nexusId);
+ // about this task to Mesos in the future.
+ hadoopIdToMesosId.remove(hadoopId);
+ mesosIdToHadoopId.remove(mesosId);
- LOG.info("Unmapping " + hadoopId + " / " + nexusId);
+ LOG.info("Unmapping " + hadoopId + " / " + mesosId);
return update;
}
@@ -434,7 +434,7 @@ public class NexusExecutor extends Execu
}
public static void main(String[] args) throws Exception {
- System.loadLibrary("nexus");
- new NexusExecutorDriver(new NexusExecutor()).run();
+ System.loadLibrary("mesos");
+ new MesosExecutorDriver(new MesosExecutor()).run();
}
}
Copied: incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MesosScheduler.java (from r1131908, incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/NexusScheduler.java)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MesosScheduler.java?p2=incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MesosScheduler.java&p1=incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/NexusScheduler.java&r1=1131908&r2=1131909&rev=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/NexusScheduler.java (original)
+++ incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/MesosScheduler.java Sun Jun 5 05:49:41 2011
@@ -19,20 +19,20 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.io.ObjectWritable;
-import nexus.ExecutorInfo;
-import nexus.FrameworkMessage;
-import nexus.NexusSchedulerDriver;
-import nexus.SchedulerDriver;
-import nexus.SlaveOffer;
-import nexus.SlaveOfferVector;
-import nexus.StringMap;
-import nexus.TaskDescription;
-import nexus.TaskDescriptionVector;
-import nexus.TaskState;
+import mesos.ExecutorInfo;
+import mesos.FrameworkMessage;
+import mesos.MesosSchedulerDriver;
+import mesos.SchedulerDriver;
+import mesos.SlaveOffer;
+import mesos.SlaveOfferVector;
+import mesos.StringMap;
+import mesos.TaskDescription;
+import mesos.TaskDescriptionVector;
+import mesos.TaskState;
-class NexusScheduler extends nexus.Scheduler {
+class MesosScheduler extends mesos.Scheduler {
public static final Log LOG =
- LogFactory.getLog(NexusScheduler.class);
+ LogFactory.getLog(MesosScheduler.class);
private final JobTracker jobTracker;
private JobConf conf;
@@ -47,7 +47,7 @@ class NexusScheduler extends nexus.Sched
private Map<String, Integer> mapSlots = new HashMap<String, Integer>();
private Map<String, Integer> reduceSlots = new HashMap<String, Integer>();
- // Maps from Nexus each task ID to the slave it's on and its task type
+ // Maps from Mesos each task ID to the slave it's on and its task type
private Map<Integer, String> taskIdToSlave = new HashMap<Integer, String>();
private Map<Integer, Boolean> taskIdIsMap = new HashMap<Integer, Boolean>();
@@ -67,14 +67,14 @@ class NexusScheduler extends nexus.Sched
private int minActiveMaps = 0;
private int minActiveReduces = 0;
- public NexusScheduler(JobTracker jobTracker) throws IOException {
+ public MesosScheduler(JobTracker jobTracker) throws IOException {
this.jobTracker = jobTracker;
this.conf = jobTracker.conf;
int handlerCount = conf.getInt("mapred.job.tracker.handler.count", 10);
rpcThreadPool = Executors.newFixedThreadPool(handlerCount);
- localityWait = conf.getLong("mapred.nexus.localitywait", 5000);
- minActiveMaps = conf.getInt("mapred.nexus.minActiveMaps", 0);
- minActiveReduces = conf.getInt("mapred.nexus.minActiveReduces", 0);
+ localityWait = conf.getLong("mapred.mesos.localitywait", 5000);
+ minActiveMaps = conf.getInt("mapred.mesos.minActiveMaps", 0);
+ minActiveReduces = conf.getInt("mapred.mesos.minActiveReduces", 0);
}
@Override
@@ -87,7 +87,7 @@ class NexusScheduler extends nexus.Sched
@Override
public ExecutorInfo getExecutorInfo(SchedulerDriver driver) {
try {
- String execPath = new File("bin/nexus-executor").getCanonicalPath();
+ String execPath = new File("bin/mesos-executor").getCanonicalPath();
byte[] initArg = conf.get("mapred.job.tracker").getBytes("US-ASCII");
return new ExecutorInfo(execPath, initArg);
} catch (IOException e) {
@@ -120,9 +120,9 @@ class NexusScheduler extends nexus.Sched
LOG.info("Examining slot on " + slot.getHost());
// Make sure it's got enough resources
- int desiredCpus = conf.getInt("mapred.nexus.desired.cpus", 1);
+ int desiredCpus = conf.getInt("mapred.mesos.desired.cpus", 1);
long desiredMem = conf.getLong(
- "mapred.nexus.desired.mem", 1024L * 1024L * 1024L);
+ "mapred.mesos.desired.mem", 1024L * 1024L * 1024L);
int offeredCpus = Integer.parseInt(slot.getParams().get("cpus"));
long offeredMem = Long.parseLong(slot.getParams().get("mem"));
@@ -203,7 +203,7 @@ class NexusScheduler extends nexus.Sched
}
@Override
- public void statusUpdate(SchedulerDriver driver, nexus.TaskStatus status) {
+ public void statusUpdate(SchedulerDriver driver, mesos.TaskStatus status) {
// Decrease active slot counts to properly schedule tasks
TaskState state = status.getState();
if (state == TaskState.TASK_FINISHED || state == TaskState.TASK_FAILED ||
@@ -225,7 +225,7 @@ class NexusScheduler extends nexus.Sched
@Override
public void error(SchedulerDriver driver, int code, String message) {
- JobTracker.LOG.fatal("Nexus error: " + message +
+ JobTracker.LOG.fatal("Mesos error: " + message +
" (error code: " + code + ")");
shutdownTracker();
}
@@ -405,7 +405,7 @@ class NexusScheduler extends nexus.Sched
}
public void run(String master) {
- driver = new NexusSchedulerDriver(this, master);
+ driver = new MesosSchedulerDriver(this, master);
driver.run();
}
}
Modified: incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ incubator/mesos/trunk/frameworks/hadoop-0.20.0/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Sun Jun 5 05:49:41 2011
@@ -479,7 +479,7 @@ public class TaskTracker
//check local disk
checkLocalDirs(this.fConf.getLocalDirs());
- // NEXUS: To run multiple Hadoops and integrate with the
+ // MESOS: To run multiple Hadoops and integrate with the
// MapOutputServer, we don't delete local files because we don't
// know who else might have local files there and we don't know
// they might be finished or not.
@@ -556,8 +556,8 @@ public class TaskTracker
DistributedCache.purgeCache(this.fConf);
cleanupStorage();
- if (useNexus) {
- this.jobClient = nexusExecutor;
+ if (useMesos) {
+ this.jobClient = mesosExecutor;
} else {
this.jobClient = (InterTrackerProtocol)
RPC.waitForProxy(InterTrackerProtocol.class,
@@ -601,7 +601,7 @@ public class TaskTracker
* startup, to remove any leftovers from previous run.
*/
public void cleanupStorage() throws IOException {
- // NEXUS: To run multiple Hadoops and integrate with the
+ // MESOS: To run multiple Hadoops and integrate with the
// MapOutputServer, we don't delete local files because we don't
// know who else might have local files there and we don't know
// they might be finished or not.
@@ -868,7 +868,7 @@ public class TaskTracker
RunJar.unJar(new File(localJarFile.toString()),
new File(localJarFile.getParent().toString()));
}
- // NEXUS: To run multiple Hadoops and integrate with the
+ // MESOS: To run multiple Hadoops and integrate with the
// MapOutputServer, we don't delete local files because we don't
// know who else might have local files there and we don't know
// they might be finished or not.
@@ -900,7 +900,7 @@ public class TaskTracker
LOG.warn("Exception shutting down TaskTracker", e);
}
}
- if (useNexus) {
+ if (useMesos) {
// TODO: send a framework message saying we're bailing out?
System.exit(1);
}
@@ -938,7 +938,7 @@ public class TaskTracker
jvmManager.stop();
// shutdown RPC connections
- if (!useNexus) {
+ if (!useMesos) {
RPC.stopProxy(jobClient);
}
@@ -960,11 +960,11 @@ public class TaskTracker
/**
* Start with the local machine name, and the default JobTracker
*/
- public TaskTracker(JobConf conf, NexusExecutor nexusExecutor)
+ public TaskTracker(JobConf conf, MesosExecutor mesosExecutor)
throws IOException {
- if (nexusExecutor != null) {
- this.useNexus = true;
- this.nexusExecutor = nexusExecutor;
+ if (mesosExecutor != null) {
+ this.useMesos = true;
+ this.mesosExecutor = mesosExecutor;
conf.set("mapred.task.tracker.http.address", "0.0.0.0:0");
}
originalConf = conf;
@@ -1002,9 +1002,9 @@ public class TaskTracker
server.addInternalServlet("taskLog", "/tasklog", TaskLogServlet.class);
server.start();
this.httpPort = server.getPort();
- if (useNexus) {
+ if (useMesos) {
// Set reported slots to 0 -- we'll create some in response
- // to slot offers from Nexus
+ // to slot offers from Mesos
mapSlots = 0;
reduceSlots = 0;
}
@@ -1656,8 +1656,8 @@ public class TaskTracker
private TaskLauncher mapLauncher;
private TaskLauncher reduceLauncher;
- private boolean useNexus;
- private NexusExecutor nexusExecutor;
+ private boolean useMesos;
+ private MesosExecutor mesosExecutor;
public JvmManager getJvmManagerInstance() {
return jvmManager;
@@ -2092,11 +2092,11 @@ public class TaskTracker
this.taskStatus.statusUpdate(taskStatus);
this.lastProgressReport = System.currentTimeMillis();
- if (useNexus && this.taskStatus.getRunState() == TaskStatus.State.COMMIT_PENDING) {
- // Report the task as done to Nexus so that it can report our slot
+ if (useMesos && this.taskStatus.getRunState() == TaskStatus.State.COMMIT_PENDING) {
+ // Report the task as done to Mesos so that it can report our slot
// as finished and get a new slot assigned before the next heartbeat
- nexus.TaskStatus s = nexusExecutor.createTaskDoneUpdate(taskStatus);
- if (s != null) nexusExecutor.getDriver().sendStatusUpdate(s);
+ mesos.TaskStatus s = mesosExecutor.createTaskDoneUpdate(taskStatus);
+ if (s != null) mesosExecutor.getDriver().sendStatusUpdate(s);
}
}
@@ -2153,11 +2153,11 @@ public class TaskTracker
runner.signalDone();
LOG.info("Task " + task.getTaskID() + " is done.");
LOG.info("reported output size for " + task.getTaskID() + " was " + taskStatus.getOutputSize());
- if (useNexus) {
- // Report the task as done to Nexus so that it can report our slot
+ if (useMesos) {
+ // Report the task as done to Mesos so that it can report our slot
// as finished and get a new slot assigned before the next heartbeat
- nexus.TaskStatus s = nexusExecutor.createTaskDoneUpdate(taskStatus);
- if (s != null) nexusExecutor.getDriver().sendStatusUpdate(s);
+ mesos.TaskStatus s = mesosExecutor.createTaskDoneUpdate(taskStatus);
+ if (s != null) mesosExecutor.getDriver().sendStatusUpdate(s);
}
}
Modified: incubator/mesos/trunk/frameworks/haproxy+apache/README.txt
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/haproxy%2Bapache/README.txt?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/haproxy+apache/README.txt (original)
+++ incubator/mesos/trunk/frameworks/haproxy+apache/README.txt Sun Jun 5 05:49:41 2011
@@ -1,4 +1,4 @@
-haproxy load balancer + Apache web server Nexus framework Readme
+haproxy load balancer + Apache web server Mesos framework Readme
----------------------------------------------------------------
First you will need to be able to run apache on the slave nodes in your cluster.
Modified: incubator/mesos/trunk/frameworks/haproxy+apache/haproxy+apache.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/haproxy%2Bapache/haproxy%2Bapache.py?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/haproxy+apache/haproxy+apache.py (original)
+++ incubator/mesos/trunk/frameworks/haproxy+apache/haproxy+apache.py Sun Jun 5 05:49:41 2011
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-import nexus
+import mesos
import os
import sys
import time
@@ -16,11 +16,11 @@ MIN_SERVERS = 1
START_THRESHOLD = 25
KILL_THRESHOLD = 5
#HAPROXY_EXE = "/root/haproxy-1.3.20/haproxy"
-HAPROXY_EXE = "/home/andyk/nexus/frameworks/haproxy+apache/haproxy-1.3.20/haproxy"
+HAPROXY_EXE = "/home/andyk/mesos/frameworks/haproxy+apache/haproxy-1.3.20/haproxy"
-class Scheduler(nexus.Scheduler):
+class Scheduler(mesos.Scheduler):
def __init__(self):
- nexus.Scheduler.__init__(self, "haproxy+apache",
+ mesos.Scheduler.__init__(self, "haproxy+apache",
os.path.join(os.getcwd(), "startapache.sh"), "")
self.lock = threading.RLock()
self.id = 0
@@ -55,7 +55,7 @@ class Scheduler(nexus.Scheduler):
self.reconfigs += 1
def registered(self, fid):
- print "Nexus haproxy+apache scheduler registered as framework #%s" % fid
+ print "Mesos haproxy+apache scheduler registered as framework #%s" % fid
def slotOffer(self, oid, slots):
print "Got slot offer %d" % oid
@@ -64,7 +64,7 @@ class Scheduler(nexus.Scheduler):
for slot in slots:
if not slot.host in self.servers.values() and self.overloaded or len(self.servers) < 1:
params = "cpus=1\nmem=1073741824"
- td = nexus.TaskDescription(self.id, slot.slaveId, "server %s" % self.id, params, "")
+ td = mesos.TaskDescription(self.id, slot.slaveId, "server %s" % self.id, params, "")
tasks.append(td)
self.servers[self.id] = slot.host
self.id += 1
@@ -78,7 +78,7 @@ class Scheduler(nexus.Scheduler):
reconfigured = False
self.lock.acquire()
if status.taskId in self.servers.keys():
- if status.state == nexus.TASK_FINISHED:
+ if status.state == mesos.TASK_FINISHED:
del self.servers[status.taskId]
self.reconfigure()
reconfigured = True
@@ -142,7 +142,7 @@ def monitor(sched):
continue
if __name__ == "__main__":
- parser = OptionParser(usage = "Usage: %prog nexus_master")
+ parser = OptionParser(usage = "Usage: %prog mesos_master")
(options,args) = parser.parse_args()
if len(args) < 1:
@@ -154,7 +154,7 @@ if __name__ == "__main__":
threading.Thread(target = monitor, args=[sched]).start()
- print "Connecting to nexus master %s" % args[0]
+ print "Connecting to mesos master %s" % args[0]
sched.run(args[0])
Modified: incubator/mesos/trunk/frameworks/haproxy+apache/startapache.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/haproxy%2Bapache/startapache.py?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/haproxy+apache/startapache.py (original)
+++ incubator/mesos/trunk/frameworks/haproxy+apache/startapache.py Sun Jun 5 05:49:41 2011
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-import nexus
+import mesos
import sys
import time
import os
@@ -15,9 +15,9 @@ def cleanup():
print e
None
-class MyExecutor(nexus.Executor):
+class MyExecutor(mesos.Executor):
def __init__(self):
- nexus.Executor.__init__(self)
+ mesos.Executor.__init__(self)
self.tid = -1
def launchTask(self, driver, task):
@@ -28,7 +28,7 @@ class MyExecutor(nexus.Executor):
if (tid != self.tid):
print "Expecting different task id ... killing anyway!"
cleanup()
- update = nexus.TaskStatus(tid, nexus.TASK_FINISHED, "")
+ update = mesos.TaskStatus(tid, mesos.TASK_FINISHED, "")
driver.sendStatusUpdate(update)
def shutdown(driver, self):
@@ -41,4 +41,4 @@ if __name__ == "__main__":
print "Starting haproxy+apache executor"
atexit.register(cleanup)
executor = MyExecutor()
- nexus.NexusExecutorDriver(executor).run()
+ mesos.MesosExecutorDriver(executor).run()
Modified: incubator/mesos/trunk/frameworks/mpi/README.txt
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/mpi/README.txt?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/mpi/README.txt (original)
+++ incubator/mesos/trunk/frameworks/mpi/README.txt Sun Jun 5 05:49:41 2011
@@ -1,9 +1,9 @@
-Nexus MPICH2 framework readme
+Mesos MPICH2 framework readme
--------------------------------------------
Table of Contents:
1) Installing MPICH2
-2) Running the Nexus MPICH2 framework
+2) Running the Mesos MPICH2 framework
=====================
1) INSTALLING MPICH2:
@@ -27,11 +27,11 @@ apt-get install debian-keyring debian-ar
apt-key update
=====================================
-2) RUNNING THE NEXUS MPICH2 FRAMEWORK
+2) RUNNING THE MESOS MPICH2 FRAMEWORK
=====================================
-1. Start a Nexus master and slaves see the NEXUS_HOME/QUICKSTART.txt for help
+1. Start a Mesos master and slaves see the MESOS_HOME/QUICKSTART.txt for help
with this.
-2. In the NEXUS_HOME/frameworks/mpi directory run the nmpiexec script. Pass the
+2. In the MESOS_HOME/frameworks/mpi directory run the nmpiexec script. Pass the
-h flag to see help options.
Example: ./nmpiexec -m 104857600 1@127.0.1.1:59608 hostname
Modified: incubator/mesos/trunk/frameworks/mpi/nmpiexec.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/mpi/nmpiexec.py?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/mpi/nmpiexec.py (original)
+++ incubator/mesos/trunk/frameworks/mpi/nmpiexec.py Sun Jun 5 05:49:41 2011
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-import nexus
+import mesos
import os
import sys
import time
@@ -28,24 +28,24 @@ def mpiexec(driver):
call(["mpdexit",MPD_PID])
driver.stop()
-class MyScheduler(nexus.Scheduler):
+class MyScheduler(mesos.Scheduler):
def __init__(self, ip, port):
- nexus.Scheduler.__init__(self)
+ mesos.Scheduler.__init__(self)
self.ip = ip
self.port = port
self.tasksLaunched = 0
self.tasksFinished = 0
def getFrameorkName(self, driver):
- return "Nexus MPI Framework"
+ return "Mesos MPI Framework"
def getExecutorInfo(self, driver):
execPath = os.path.join(os.getcwd(), "startmpd.sh")
initArg = ip + ":" + port
- return nexus.ExecutorInfo(execPath, initArg)
+ return mesos.ExecutorInfo(execPath, initArg)
def registered(self, driver, fid):
- print "Nexus MPI scheduler and mpd running at "+self.ip+":"+self.port
+ print "Mesos MPI scheduler and mpd running at "+self.ip+":"+self.port
def resourceOffer(self, driver, oid, offers):
print "Got offer %d" % oid
@@ -64,7 +64,7 @@ class MyScheduler(nexus.Scheduler):
tid = self.tasksLaunched
print "Accepting slot to start mpd %d" % tid
params = {"cpus": "%d" % CPUS, "mem": "%d" % MEM}
- td = nexus.TaskDescription(
+ td = mesos.TaskDescription(
tid, offer.slaveId, "task %d" % tid, params, "")
tasks.append(td)
self.tasksLaunched += 1
@@ -80,10 +80,10 @@ class MyScheduler(nexus.Scheduler):
def statusUpdate(self, driver, update):
print "Task %d in state %d" % (update.taskId, update.state)
- if (update.state == nexus.TASK_FINISHED or
- update.state == nexus.TASK_FAILED or
- update.state == nexus.TASK_KILLED or
- update.state == nexus.TASK_LOST):
+ if (update.state == mesos.TASK_FINISHED or
+ update.state == mesos.TASK_FAILED or
+ update.state == mesos.TASK_KILLED or
+ update.state == mesos.TASK_LOST):
print "A task finished unexpectedly, calling mpdexit "+MPD_PID
call(["mpdexit",MPD_PID])
driver.stop()
@@ -109,7 +109,7 @@ def parseIpPort(s):
return (ip,port)
if __name__ == "__main__":
- parser = OptionParser(usage="Usage: %prog [options] nexus_master mpi_program")
+ parser = OptionParser(usage="Usage: %prog [options] mesos_master mpi_program")
parser.add_option("-n","--num",
help="number of slots/mpd:s to allocate (default 1)",
dest="num", type="int", default=1)
@@ -131,7 +131,7 @@ if __name__ == "__main__":
MEM = options.mem
MPI_TASK = " ".join(args[1:])
- print "Connecting to nexus master %s" % args[0]
+ print "Connecting to mesos master %s" % args[0]
try:
call(["mpd","--daemon"])
@@ -147,4 +147,4 @@ if __name__ == "__main__":
MPD_PID = traceline.split(" ")[0]
sched = MyScheduler(ip, port)
- nexus.NexusSchedulerDriver(sched, args[0]).run()
+ mesos.MesosSchedulerDriver(sched, args[0]).run()
Modified: incubator/mesos/trunk/frameworks/mpi/startmpd.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/mpi/startmpd.py?rev=1131909&r1=1131908&r2=1131909&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/mpi/startmpd.py (original)
+++ incubator/mesos/trunk/frameworks/mpi/startmpd.py Sun Jun 5 05:49:41 2011
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-import nexus
+import mesos
import sys
import time
import os
@@ -16,9 +16,9 @@ def cleanup():
print e
None
-class MyExecutor(nexus.Executor):
+class MyExecutor(mesos.Executor):
def __init__(self):
- nexus.Executor.__init__(self)
+ mesos.Executor.__init__(self)
def init(self, driver, arg):
[ip,port] = arg.data.split(":")
@@ -44,4 +44,4 @@ if __name__ == "__main__":
print "Starting executor"
atexit.register(cleanup)
executor = MyExecutor()
- nexus.NexusExecutorDriver(executor).run()
+ mesos.MesosExecutorDriver(executor).run()