builders: Drop overload concept

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index d10fc7c6392fdf3924389634e1e16962ccc80d29..861e324e2651f6370881a9c9544e3650f41dbd9b 100644 (file)
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -333,13 +333,6 @@ class Builder(base.DataObject):
        def space_free(self):
                return self.data.space_free
 
-       @property
-       def overload(self):
-               if not self.cpu_count or not self.loadavg1:
-                       return None
-
-               return self.loadavg1 >= self.cpu_count
-
        @property
        def host_key_id(self):
                return self.data.host_key_id

diff --git a/src/database.sql b/src/database.sql
index 53be666292f008c3b51d92d15bce33da13e4e227..529c93ac92b3c4df8ceb5ef77707a3b5876bccea 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -563,7 +563,6 @@ CREATE TABLE builders (
     cpu_arch text,
     cpu_bogomips double precision,
     memory bigint DEFAULT 0 NOT NULL,
-    overload builders_overload DEFAULT 'N'::builders_overload NOT NULL,
     free_space bigint DEFAULT 0 NOT NULL,
     host_key_id text,
     time_created timestamp without time zone DEFAULT now() NOT NULL,

diff --git a/src/templates/builders/detail.html b/src/templates/builders/detail.html
index 85358fb579099d865f490b6c970ff04d4038b788..dc4d80772a7f79ef5341ae2ff9b7ad67bd4cc2a6 100644 (file)
--- a/src/templates/builders/detail.html
+++ b/src/templates/builders/detail.html
@@ -80,15 +80,6 @@
                </div>
        {% end %}
 
-       {% if builder.overload %}
-               <div class="alert alert-block alert-warning">
-                       <h4 class="alert-heading">{{ _("Warning") }}!</h4>
-                       {{ _("This builder is overloaded.") }}
-                       {{ _("That means it will not take any additional jobs although it has not reached its threshold of running jobs, yet.") }}
-                       {{ _("New jobs will be started automatically after the load decreased.") }}
-               </div>
-       {% end %}
-
        <div class="row">
                <div class="span5">
                        <table class="table table-striped table-hover">
@@ -192,9 +183,6 @@
                                                <td>{{ _("Load average") }}</td>
                                                <td>
                                                        {{ builder.loadavg or _("N/A") }}
-                                                       {% if builder.overload %}
-                                                                       <span class="label label-important">{{ _("Overload") }}</span>
-                                                       {% end %}
                                                </td>
                                        </tr>
                                        <tr>

diff --git a/src/templates/builders/list.html b/src/templates/builders/list.html
index cf6ac190711d18d9f8d49f6b4584f856eb59196f..19f5aef615e62b7f358833c1e34761d1416e681b 100644 (file)
--- a/src/templates/builders/list.html
+++ b/src/templates/builders/list.html
@@ -42,9 +42,6 @@
                                                        </td>
                                                        <td>
                                                                <a href="/builder/{{ builder.name }}">{{ builder.name }}</a>
-                                                               {% if builder.overload %}
-                                                                               <span class="label label-important pull-right">{{ _("Overload") }}</span>
-                                                               {% end %}
                                                                <br>
                                                                {{ builder.cpu_model or _("Unknown CPU") }}
                                                                {% if builder.mem_total %}