myriad-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smare...@apache.org
Subject [5/8] incubator-myriad git commit: rebase and removed all but one shutdown
Date Wed, 28 Oct 2015 23:49:24 GMT
rebase and removed all but one shutdown

Update

updated


Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/3ae7da2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/3ae7da2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/3ae7da2d

Branch: refs/heads/master
Commit: 3ae7da2d37ca5cf3004fcdc9888118f22096d7a3
Parents: ce2b9f0
Author: Paul Read <pdread101@gmail.com>
Authored: Mon Aug 17 11:06:01 2015 -0400
Committer: Santosh Marella <marella@gmail.com>
Committed: Wed Oct 28 14:10:12 2015 -0700

----------------------------------------------------------------------
 .../apache/myriad/api/ControllerResource.java   |   39 +-
 .../src/main/resources/webapp/js/app.js         |    4 -
 .../webapp/js/components/HelpComponent.js       |   40 +-
 .../webapp/js/components/NavbarComponent.js     |   24 +-
 .../js/components/ShutdownFrameworkComponent.js |    3 +-
 .../main/resources/webapp/public/js/myriad.js   | 1921 ++++++++++++------
 6 files changed, 1316 insertions(+), 715 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/3ae7da2d/myriad-scheduler/src/main/java/org/apache/myriad/api/ControllerResource.java
----------------------------------------------------------------------
diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/api/ControllerResource.java
b/myriad-scheduler/src/main/java/org/apache/myriad/api/ControllerResource.java
index c62888c..b47f1cc 100644
--- a/myriad-scheduler/src/main/java/org/apache/myriad/api/ControllerResource.java
+++ b/myriad-scheduler/src/main/java/org/apache/myriad/api/ControllerResource.java
@@ -44,9 +44,8 @@ public class ControllerResource {
         this.myriadOperations = myriadOperations;
     }
     /**
-     * Shutdown framework means the RM shutdown and the Mesos driver is stopped in failover
mode
-     * so the RM must come back up and re-register, or another RM takes over in HA mode.
-     * 
+     * Shutdown framework means the Mesos driver is stopped, all executors and tasks as well.
+      * 
      * @return a successful response. 
      */      
     @Timed
@@ -61,39 +60,5 @@ public class ControllerResource {
         return Response.ok().build();
     }  
     
-    /**
-     * Shutdown "manager only" means the RM shutdown and the Mesos driver is stopped in failover
mode
-     * so the RM must come back up and re-register, or another RM takes over in HA mode.
-     * 
-     * @return a successful response. 
-     */   
-    @Timed
-    @GET
-    @Path("/shutdown/managerOnly")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response shutdownResourceManager() {
-        LOGGER.info("shutdown....terminating resource manager only ... ");
-     
-        myriadOperations.shutdownResourceManager();
    
-        return Response.ok().build();
-    }
-    
-    /**
-     * Shutdown gracefully means the RM, tasks, and executor(s) are stopped but
-     * the RM can be started right back up.
-     * 
-     * @return a successful response. 
-     */
-    @Timed
-    @GET
-    @Path("/shutdown/graceful")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response shutdownGraceful() {
-        LOGGER.info("shutdown....terminating myraid gracefully ... ");
-        
-        myriadOperations.shutdownGraceful();
-        
-        return Response.ok().build();
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/3ae7da2d/myriad-scheduler/src/main/resources/webapp/js/app.js
----------------------------------------------------------------------
diff --git a/myriad-scheduler/src/main/resources/webapp/js/app.js b/myriad-scheduler/src/main/resources/webapp/js/app.js
index d482ba6..44a00b9 100644
--- a/myriad-scheduler/src/main/resources/webapp/js/app.js
+++ b/myriad-scheduler/src/main/resources/webapp/js/app.js
@@ -5,9 +5,7 @@ var TasksComponent = require('./components/TasksComponent')
 var ConfigComponent = require('./components/ConfigComponent')
 var AboutComponent = require('./components/AboutComponent')
 var HelpComponent = require('./components/HelpComponent')
-var ShutdownRmOnlyComponent = require('./components/ShutdownRmOnlyComponent')
 var ShutdownFrameworkComponent = require('./components/ShutdownFrameworkComponent')
-var ShutdownGracefulComponent = require('./components/ShutdownGracefulComponent')
 
 var Router = require('react-router')
   , RouteHandler= Router.RouteHandler
@@ -16,9 +14,7 @@ var Router = require('react-router')
 
 var routes = (
   <Route name="myriad" path="/" handler={Myriad} >
-    <Route name="rmDown" path="rmDown" {...this.props} handler={ShutdownRmOnlyComponent}
/> 
     <Route name="frameworkDown" path="frameworkDown" {...this.props} handler={ShutdownFrameworkComponent}
/> 
-    <Route name="gracefulDown" path="gracefulDown" {...this.props} handler={ShutdownGracefulComponent}
/> 
     <Route name="flex" path="flex" handler={FlexComponent} />
     <Route name="tasks" path="tasks" handler={TasksComponent} />
     <Route name="help" path="help" handler={HelpComponent} />

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/3ae7da2d/myriad-scheduler/src/main/resources/webapp/js/components/HelpComponent.js
----------------------------------------------------------------------
diff --git a/myriad-scheduler/src/main/resources/webapp/js/components/HelpComponent.js b/myriad-scheduler/src/main/resources/webapp/js/components/HelpComponent.js
index 52feff2..ba43339 100644
--- a/myriad-scheduler/src/main/resources/webapp/js/components/HelpComponent.js
+++ b/myriad-scheduler/src/main/resources/webapp/js/components/HelpComponent.js
@@ -6,30 +6,24 @@ var HelpComponent = React.createClass({
   render: function () {
     return(
       <div>
-	<h4>Myriad dropdown menu</h4>
+      	<h4>Myriad dropdown menu</h4>
         <ul>
-	   <li>Shutdown RM Only</li>
-		<p>Stop only the ResourceManager. The excutors and tasks continue to run.</p>
-           <li>Shutdown Framework, Stopping Driver</li>
-		<p> This will stop the driver in failover mode, which will stop the executor and
tasks, then stop the ResourceManager.
-       		This requires the ResourceManager to be either in HA mode or restarted so that it
re-registers with Mesos. </p>
-           <li>Shutdown Framework, Aborting Driver</li>
- 		<p> This will shutdown all the tasks, then send a FrameworkMessage shutdown to the
executor, then exits the ResourceManager.
-		This allows the ResourceManager to be started backup without requiring it to re-register
or be in High Availability (HA) mode, great for testing.</p> 
-	</ul>
-	<h4>Flex tab</h4>
-	<p>Allows you to stand up or stop task resources</p>
-	<h4>Tasks tab</h4>
-	<p>Allows you to monitor running task states</p>
-	<h4>Help menu</h4>
-	<ul>
-	   <li>Menu options</li>
-		<p>This text</p>
-	   <li>About Myriad</li>
-		<p>Description of Myriad and its profiles</p>
-	</ul>
-	<h4>Config tab</h4>
-	<p>Shows Myriad configuration information</p>
+            <li>Shutdown Framework, Stopping Driver</li>
+            	<p> This will stop the driver in failover mode, which will stop the executor
and tasks, but not stop the ResourceManager.</p>
+        </ul>
+		<h4>Flex tab</h4>
+		<p>Allows you to stand up or stop task resources</p>
+		<h4>Tasks tab</h4>
+		<p>Allows you to monitor running task states</p>
+		<h4>Help menu</h4>
+		<ul>
+		   <li>Menu options</li>
+			<p>This text</p>
+		   <li>About Myriad</li>
+			<p>Description of Myriad and its profiles</p>
+		</ul>
+		<h4>Config tab</h4>
+		<p>Shows Myriad configuration information</p>
       </div>
    )}
 

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/3ae7da2d/myriad-scheduler/src/main/resources/webapp/js/components/NavbarComponent.js
----------------------------------------------------------------------
diff --git a/myriad-scheduler/src/main/resources/webapp/js/components/NavbarComponent.js b/myriad-scheduler/src/main/resources/webapp/js/components/NavbarComponent.js
index e8988d0..ce1a2a3 100644
--- a/myriad-scheduler/src/main/resources/webapp/js/components/NavbarComponent.js
+++ b/myriad-scheduler/src/main/resources/webapp/js/components/NavbarComponent.js
@@ -17,32 +17,26 @@ var NavbarComponent = React.createClass({
 
   render: function () {
     return(
-<<<<<<< HEAD
     <Navbar fixedTop inverse>
       <Nav>
       <a className="navbar-brand" href="#">
           <img src="/img/navbar_logo.png"></img>
       </a>
-=======
-    <Navbar fixedTop>
-      <Nav bsStyle='tabs'   >
-	<DropdownButton  title='Myriad' naveItem={true} >
-	   <NavItemLink  to="rmDown">Shutdown RM Only</NavItemLink>
-	   <NavItemLink  to="frameworkDown">Shutdown Framework, Stopping Driver</NavItemLink>
-	   <NavItemLink  to="gracefulDown">Shutdown Framework, Aborting Driver</NavItemLink>
-	</DropdownButton>
->>>>>>> 4721509... Update
       </Nav>
+      <Nav bsStyle='tabs'   >
+      		<DropdownButton  title='Myriad' naveItem={true} >
+      			<NavItemLink  to="frameworkDown">Shutdown Framework</NavItemLink>
+ 	   		</DropdownButton>
+ 	  </Nav>
       <Nav>
         <NavItemLink to="flex">Flex</NavItemLink>
         <NavItemLink to="tasks">Tasks</NavItemLink>
       </Nav>
-
       <Nav bsStyle='tabs'   >
-	<DropdownButton  title='Help' naveItem={true} >
-	   <NavItemLink  to="help">Menu Options</NavItemLink>
-	   <NavItemLink  to="about">About Myriad</NavItemLink>
-	</DropdownButton>
+      	<DropdownButton  title='Help' naveItem={true} >
+      		<NavItemLink  to="help">Menu Options</NavItemLink>
+      		<NavItemLink  to="about">About Myriad</NavItemLink>
+      	</DropdownButton>
       </Nav>
 
       <Nav right>

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/3ae7da2d/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
----------------------------------------------------------------------
diff --git a/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
b/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
index 288854e..27a515b 100644
--- a/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
+++ b/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
@@ -27,8 +27,7 @@ var XModal = React.createClass({
   	render() {
     		return ( <Modal {...this.props} bsStyle='primary'   id="shutdownModal" title='Shutdown
Myriad Framework ?' animation={false}  					onRequestHide={this.handleToggle}>
 	 			<div className='modal-body' >
-					<p> This will stop the driver in failover mode, which will stop the executor and
tasks, then stop the ResourceManager.</p>
-       					<p> This requires the ResourceManager to be either in HA mode or restarted
so that it re-registers with Mesos. </p>
+					<p> This will stop the driver in failover mode, which will stop the executor and
tasks, but not stop the ResourceManager.</p>
 				</div>
        				<div className='modal-footer'>
        	    				<Button bsStyle="default" onClick={function() {


Mime
View raw message