Merge remote branch 'cros/upstream' into tempbranch3

scheduler/monitor_db.py

 #!/usr/bin/python -u
 
 """
 Autotest scheduler
 """
 
 
 import common
 import datetime, errno, optparse, os, pwd, Queue, re, shutil, signal
-import smtplib, socket, stat, subprocess, sys, tempfile, time, traceback
+import smtplib, socket, stat, subprocess, sys, tempfile, time, traceback, urllib
 import itertools, logging, weakref, gc
 
 import MySQLdb
 
 from autotest_lib.scheduler import scheduler_logging_config
 from autotest_lib.frontend import setup_django_environment
 
 import django.db
 
 from autotest_lib.client.common_lib import global_config, logging_manager
@@ skipping 1795 matching lines @@
 
 
     def _write_keyvals_before_job(self, keyval_dict):
         self._write_keyvals_before_job_helper(keyval_dict, self._keyval_path())
 
 
     def _write_host_keyvals(self, host):
         keyval_path = os.path.join(self._working_directory(), 'host_keyvals',
                                    host.hostname)
         platform, all_labels = host.platform_and_labels()
+        all_labels = [ urllib.quote(label) for label in all_labels ]
         keyval_dict = dict(platform=platform, labels=','.join(all_labels))
         self._write_keyvals_before_job_helper(keyval_dict, keyval_path)
 
 
 class SpecialAgentTask(AgentTask, TaskWithJobKeyvals):
     """
     Subclass for AgentTasks that correspond to a SpecialTask entry in the DB.
     """
 
     TASK_TYPE = None
@@ skipping 755 matching lines @@
             paired_process = self._paired_with_monitor().get_process()
             _drone_manager.write_lines_to_file(
                     failed_file, ['Archiving failed with exit code %s'
                                   % self.monitor.exit_code()],
                     paired_with_process=paired_process)
         self._set_all_statuses(self._final_status())
 
 
 if __name__ == '__main__':
     main()