Ask for confirmation before committing.

infra/tools/restart/restart.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import contextlib
 import datetime
+import distutils.util
 import json
 import logging
 import os
 import re
 import shutil
 import subprocess
 import sys
 import tempfile
 
 
 from infra.libs.time_functions import zulu
 
 
 LOGGER = logging.getLogger(__name__)
 
+MM_REPO = 'https://chrome-internal.googlesource.com/infradata/master-manager'
+
 
 class MasterNotFoundException(Exception):
   pass
 
 
 def add_argparse_options(parser):
   parser.add_argument('masters', type=str, nargs='+', help='Master to restart.')
   parser.add_argument(
       '-m', '--minutes-in-future', default=15, type=int,
       help='how many minutes in the future to schedule the restart. '
            'use 0 for "now." default %(default)d')
+  parser.add_argument(
+      '--force', action='store_true',

[Ryan Tseng, 2015/09/08 22:10:39]

+ short arg "-f"

[ghost stip (do not use), 2015/09/09 00:08:53]

Done.

+      help='don\'t ask for confirmation, just commit')
 
 
 def get_restart_time(delta):
   """Returns a zulu time string of when to restart a master, now + delta."""
   restart_time = datetime.datetime.utcnow() + delta
   return zulu.to_zulu_string(restart_time)
 
 
 @contextlib.contextmanager
 def get_master_state_checkout():
   target_dir = tempfile.mkdtemp()
-  mm_repo = 'https://chrome-internal.googlesource.com/infradata/master-manager'
   try:
-    LOGGER.info('Cloning %s into %s' % (mm_repo, target_dir))
-    subprocess.call(['git', 'clone', mm_repo, target_dir])
+    LOGGER.info('Cloning %s into %s' % (MM_REPO, target_dir))
+    subprocess.call(['git', 'clone', MM_REPO, target_dir])
     LOGGER.info('done')
     yield target_dir
   finally:
     shutil.rmtree(target_dir)
 
 
-def commit(target, masters):
+def commit(target, masters, timestring, force):
   """Commits the local CL via the CQ."""
   desc = 'Restarting masters %s' % ', '.join(masters)
   subprocess.check_call(
       ['git', 'commit', '--all', '--message', desc], cwd=target)
+
+  print
+  print 'Restarting the following masters at %s' % timestring

[Ryan Tseng, 2015/09/08 22:10:39]

Suggestion:
Restarting the following masters in 5 minutes (<timestring>)

[ghost stip (do not use), 2015/09/09 00:08:54]

Done.

+  for master in sorted(masters):
+    print '  %s' % master
+  print

[Ryan Tseng, 2015/09/08 22:10:39]

+print "This will upload a CL for master_manager.git, TBR <person>, and commit
the CL through the CQ"

[ghost stip (do not use), 2015/09/09 00:08:54]

Done.

+
+  if not force:
+    print 'Commit? [Y/n]:',
+    input_string = raw_input()
+    if input_string != '' and not distutils.util.strtobool(input_string):

[Ryan Tseng, 2015/09/08 22:10:39]

https://big.corp.google.com/~jmcmaster/testing/2015/07/episode-387-improving-...

if input_string == '' or distutil......:
  positive stuff
  return

print 'Aborting'

[ghost stip (do not use), 2015/09/09 00:08:54]

problem is, this has to return to stop control flow (otherwise you'd have to
nest the if not force in there). I tried to split it into two, but the logic
just doesn't work out

+      print 'Aborting.'
+      return
+
+  print 'To cancel, edit desired_master_state.json in %s.' % MM_REPO
+  print
+
   LOGGER.info('Uploading to Rietveld and CQ.')
   subprocess.check_call(
       ['git', 'cl', 'upload', '-m', desc, '-t', desc,
        '--tbr-owners', '-c', '-f'], cwd=target)
 
 
-def run(masters, delta):
+def run(masters, delta, force):
   """Restart all the masters in the list of masters.
 
     Schedules the restart for now + delta.
   """
   # Step 1: Acquire a clean master state checkout.
   # This repo is too small to consider caching.
   master_state_dir = get_master_state_checkout()
   with get_master_state_checkout() as master_state_dir:
     master_state_json = os.path.join(
         master_state_dir, 'desired_master_state.json')
@@ skipping 15 matching lines @@
           'desired_state': 'running', 'transition_time_utc': restart_time
       })
 
     LOGGER.info('Writing back to JSON file, %d new entries' % len(master_state))
     with open(master_state_json, 'w') as f:
       json.dump(
           master_state, f, sort_keys=True, indent=2, separators=(',', ':'))
 
     # Step 3: Send the patch to Rietveld and commit it via the CQ.
     LOGGER.info('Committing back into repository')
-    commit(master_state_dir, masters)
+    commit(master_state_dir, masters, restart_time, force)