Merge lp:~qzhang/lava-dispatcher/fix-861115 into lp:lava-dispatcher

[Spring Zhang]

fix Bug 861115

[Spring Zhang (qzhang)]

Please have a test, I didn't have available Android image.

[Yongqin Liu (liuyq0307)]

116 + self.android_result_dir = mkdtemp(dir=LavaClient.lava_result_dir)
117 + os.chmod(self.android_result_dir, 0755)

LavaClient doesn't have property lava_result_dir, it should be self.context.lava_result_dir I think.

btw, about the mode, default is as below, why need to change?

The directory is readable, writable, and searchable only by the creating user.

review: Needs Fixing

[lp:~qzhang/lava-dispatcher/fix-861115]

128. By Spring Zhang on 2011-09-28

fix by comments

[Spring Zhang (qzhang)]

> 116 + self.android_result_dir =
> mkdtemp(dir=LavaClient.lava_result_dir)
> 117 + os.chmod(self.android_result_dir, 0755)
>
> LavaClient doesn't have property lava_result_dir, it should be
> self.context.lava_result_dir I think.
right
>
> btw, about the mode, default is as below, why need to change?
It's 0700 by default, I changed it to follow the routine in lava code

>
> The directory is readable, writable, and searchable only by the creating user.

[Spring Zhang (qzhang)]

fix some errors

review: Needs Resubmitting

[Yongqin Liu (liuyq0307)]

last night i dreamed a problem.
if we use a uniqe name for each job in the result directory, then if the job failed to submit the results to lava-server,
when the failed results will be resubmitted?

another problem I think about is that whether it is good to put the result in /tmp directory?
For my ubuntu os, if I reboot, the /tmp directory will be cleared.
For our lava-dispatcher case, there is chance that the failed results will be cleared I think.

[Yongqin Liu (liuyq0307)]

> last night i dreamed a problem.
> if we use a uniqe name for each job in the result directory, then if the job
> failed to submit the results to lava-server,
> when the failed results will be resubmitted?
Here use lava-result-directory for the result directory specified by user, lava-android-test-result-directory for the directory created by lava-dispatcher temporarily.
For this problem, how about doing combinationg and submit for each lava-android-test-result-directory failed to submitted last time in the lava-result-directory?
Normally, the lava-result-directory will only contain lava-android-test-result-directory that its lava-dispatcher still running. So each lava-dispatcher will only combine and submit its result.
If there are lava-android-test-result-directory that the lava-dispatcher create it is not running, then combine it and submit its results, otherwise the results will not be submitted again.
If its lava-dispatcher is still running, then this lava-android-test-result-directory will be ignored, it will be submitted by its lava-dispatcher.

but the logic will become a little complicate.
For it need to add a flag for each lava-android-test-result-directory to specify whether its lava-dispatcher is still running.

review: Needs Fixing

[Spring Zhang (qzhang)]

If the result submitting failed, we leave it now. We can draft a work item about result cache submitting in Internet environment, when the dashboard is in a public website and validation farm is not placed with dashboard server.

[Yongqin Liu (liuyq0307)]

when execute lava-dispatcher, it reports errors as below:

$ ./lava-dispatch doc/lava-android-test-leb-panda.json
Traceback (most recent call last):
  File "./lava-dispatch", line 59, in <module>
    job = LavaTestJob(jobdata, oob_file)
  File "/tmp/fix-861115/lava_dispatcher/__init__.py", line 42, in __init__
    self.job_data)
  File "/tmp/fix-861115/lava_dispatcher/__init__.py", line 125, in __init__
    self._client = LavaAndroidClient(self, device_config)
  File "/tmp/fix-861115/lava_dispatcher/android_client.py", line 33, in __init__
    self.android_result_dir = mkdtemp(dir=self.context.lava_result_dir)
  File "/tmp/fix-861115/lava_dispatcher/__init__.py", line 149, in lava_result_dir
    if self.client.android_result_dir:
  File "/tmp/fix-861115/lava_dispatcher/__init__.py", line 133, in client
    return self._client
AttributeError: 'LavaContext' object has no attribute '_client'
18:13:45 liuyq:fix-861115$

review: Needs Fixing

[Spring Zhang (qzhang)]

Thanks, the object creating is a recursive call, so it failed.

[Paul Larson (pwlars)]

Please merge this when liuyq has tested it and it looks good.

[lp:~qzhang/lava-dispatcher/fix-861115]

129. By Spring Zhang on 2011-10-10

break recursive call between Client and LavaContext

130. By Spring Zhang on 2011-10-10

merge with mainline

131. By Spring Zhang on 2011-10-10

Fix bugs caused by creating result directory in advance

[Yongqin Liu (liuyq0307)]

tested.

review: Approve

[lp:~qzhang/lava-dispatcher/fix-861115]

132. By Spring Zhang on 2011-10-10

merge with mainline

[Spring Zhang (qzhang)]

Thanks Yongqin on test.

=== modified file 'lava_dispatcher/__init__.py'
--- lava_dispatcher/__init__.py	2011-09-28 03:41:31 +0000
+++ lava_dispatcher/__init__.py	2011-10-10 16:12:17 +0000
@@ -146,6 +146,8 @@
 
     @property
     def lava_result_dir(self):
+        if self.client.android_result_dir:
+            return self.client.android_result_dir
         return self.config.get("LAVA_RESULT_DIR")
 
     @property
 
=== modified file 'lava_dispatcher/actions/launch_control.py'
--- lava_dispatcher/actions/launch_control.py	2011-09-27 10:36:53 +0000
+++ lava_dispatcher/actions/launch_control.py	2011-10-10 16:12:17 +0000
@@ -70,18 +70,16 @@
             logging.warning("Fault string: %s" % err.faultString)
 
 class cmd_submit_results_on_host(SubmitResultAction):
-
     def run(self, server, stream):
-
         #Upload bundle files to dashboard
         logging.info("Executing submit_results_on_host command")
         bundlename_list = []
         status = 'pass'
         err_msg = ''
         try:
-            bundle_list = os.listdir("/tmp/%s" % self.context.lava_result_dir)
+            bundle_list = os.listdir(self.context.lava_result_dir)
             for bundle_name in bundle_list:
-                bundle = "/tmp/%s/%s" % (self.context.lava_result_dir, bundle_name)
+                bundle = "%s/%s" % (self.context.lava_result_dir, bundle_name)
                 bundlename_list.append(bundle)
                 f = open(bundle)
                 content = f.read()
@@ -92,17 +90,15 @@
             status = 'fail'
             err_msg = err_msg + " Some test case result appending failed."
 
-
         self.submit_combine_bundles(status, err_msg, server, stream)
 
-        if status == 'fail':
-            raise OperationFailed(err_msg)
-
         for bundle in bundlename_list:
             os.remove(bundle)
+        shutil.rmtree(self.context.lava_result_dir)
+        if status == 'fail':
+            raise OperationFailed(err_msg)
 
 class cmd_submit_results(SubmitResultAction):
-
     def run(self, server, stream, result_disk="testrootfs"):
         """Submit test results to a lava-dashboard server
         :param server: URL of the lava-dashboard server RPC endpoint
@@ -133,7 +129,7 @@
         status = 'pass'
         err_msg = ''
         master_ip = client.get_master_ip()
-        if master_ip != None:
+        if master_ip:
             # Set 80 as server port
             client.run_cmd_master('python -m SimpleHTTPServer 80 &> /dev/null &')
             time.sleep(3)
@@ -144,7 +140,6 @@
 
             # download test result with a retry mechanism
             # set retry timeout to 2mins
-
             logging.info("About to download the result tarball to host")
             now = time.time()
             timeout = 120
@@ -195,6 +190,7 @@
 def _get_dashboard(server):
     if not server.endswith("/"):
         server = ''.join([server, "/"])
+
     #add backward compatible for 'dashboard/'-end URL
     #Fix it: it's going to be deleted after transition
     if server.endswith("dashboard/"):
@@ -211,6 +207,7 @@
     else:
         logging.warn("The url seems not RPC2 or xml-rpc endpoints, please make sure it's a valid one!!!")
         dashboard = srv.dashboard
+
     logging.info("server RPC endpoint URL: %s" % server)
     return dashboard
 
 
=== modified file 'lava_dispatcher/actions/lava-android-test.py'
--- lava_dispatcher/actions/lava-android-test.py	2011-09-20 06:14:43 +0000
+++ lava_dispatcher/actions/lava-android-test.py	2011-10-10 16:12:17 +0000
@@ -18,6 +18,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses>.
+
 import sys
 import pexpect
 import time
@@ -61,11 +62,11 @@
         return dev_name
 
 class cmd_lava_android_test_run(AndroidTestAction):
-    def run(self, test_name, timeout= -1):
+    def run(self, test_name, timeout=-1):
         #Make sure in test image now
         dev_name = self.is_ready_for_test()
         bundle_name = test_name + "-" + datetime.now().strftime("%H%M%S")
-        cmd = 'lava-android-test run %s -s %s -o /tmp/%s/%s.bundle' % (
+        cmd = 'lava-android-test run %s -s %s -o %s/%s.bundle' % (
                 test_name, dev_name, self.context.lava_result_dir, bundle_name)
 
         rc = pexpect.run(cmd, timeout=None, logfile=sys.stdout, withexitstatus=True)[1]
 
=== modified file 'lava_dispatcher/android_client.py'
--- lava_dispatcher/android_client.py	2011-09-23 02:53:30 +0000
+++ lava_dispatcher/android_client.py	2011-10-10 16:12:17 +0000
@@ -19,15 +19,23 @@
 
 import pexpect
 import sys
+import os
 import time
 from lava_dispatcher.client import LavaClient, OperationFailed, NetworkError, GeneralError
 import logging
 
 from utils import string_to_list
+from tempfile import mkdtemp
 
 class LavaAndroidClient(LavaClient):
+    def __init__(self, context, config):
+        LavaClient.__init__(self, context, config)
+        # use a random result directory on android for they are using same host
+        self.android_result_dir = mkdtemp(
+            dir='/tmp/%s' % context.config.get("LAVA_RESULT_DIR"))
+        os.chmod(self.android_result_dir, 0755)
 
-    def run_adb_shell_command(self, dev_id, cmd, response, timeout= -1):
+    def run_adb_shell_command(self, dev_id, cmd, response, timeout=-1):
         adb_cmd = "adb -s %s shell %s" % (dev_id, cmd)
         try:
             adb_proc = pexpect.spawn(adb_cmd, logfile=sys.stdout)