Przeglądaj źródła

[jb] Hide direct link to logs for Spark jobs on main page

This is because we don't have a way to pull Spark tasks and logs yet.
Romain Rigaux 10 lat temu
rodzic
commit
a438801b28

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/jobs.mako

@@ -231,7 +231,7 @@ ${ components.menubar() }
                 '>${ _('Kill') }</a>';
       }
       return [
-        '<a href="' + emptyStringIfNull(job.logs) + '" data-row-selector-exclude="true"><i class="fa fa-tasks"></i></a>',
+        job.applicationType != 'SPARK' ? '<a href="' + emptyStringIfNull(job.logs) + '" data-row-selector-exclude="true"><i class="fa fa-tasks"></i></a>' : '',
         '<a href="' + emptyStringIfNull(job.url) + '" title="${_('View this job')}" data-row-selector="true">' + emptyStringIfNull(job.shortId) + '</a>',
         emptyStringIfNull(job.name),
         '<span class="label ' + getStatusClass(job.status) + '">' + (job.isRetired && !job.isMR2 ? '<i class="fa fa-briefcase fa fa-white" title="${ _('Retired') }"></i> ' : '') + job.status + '</span>',

+ 1 - 1
apps/jobbrowser/src/jobbrowser/yarn_models.py

@@ -81,7 +81,7 @@ class Application(object):
     return self.api.kill(self.id)
 
   def filter_tasks(self, *args, **kwargs):
-    pass
+    return []
 
 
 class SparkJob(Application):

+ 1 - 1
apps/search/src/search/tests.py

@@ -112,7 +112,7 @@ class TestWithMockedSolr(TestSearchBase):
     assert_true('Annalisa A Guaragna' in response.content, response.content)
 
     assert_true('journal_title' in response.content, response.content)
-    assert_true('angewandte' in response.content, response.content)
+    assert_true('Angewandte' in response.content, response.content)
 
     assert_true('"numFound": 4' in response.content, response.content)