[LNT] Provide a way to reliably point to results page

[leandron]

Summary

This is a proposed fix for "Bug 35002 - Provide a way to reliably point to results page".

This change makes the database ID to be reused when submitting data for an existing order with "--merge replace".

It modifies the previous behaviour of creating a new ID for the same order number which turns the URL for the previous submit to be invalid.

Bugzilla issue: https://bugs.llvm.org//show_bug.cgi?id=35002

[leandron]

Notice: I'll update this review with an automated test.

[MatzeB]

This would indeed solve most of the pain with a small change.

I faintly remember having trouble with mysql when choosing IDs myself in another project. But I think the column was marked autoincrement back then which I think our ID column is, so let's go with this.

lnt/server/db/testsuitedb.py

1003

Isn't this the same as new_id = existing_run_id here?

[leandron]

Thanks for the feedback. This is commited as r321160 including a test and code simplification as suggested.

lnt/server/db/testsuitedb.py

def __init__(self, v4db, name, test_suite):
             for item in fields:
                 iname = item.name
                 if iname in class_dict:
                     raise ValueError("test suite defines reserved key %r" %
                                      (iname,))
 
                 class_dict[iname] = item.column = make_run_column(iname)
 
-            def __init__(self, machine, order, start_time, end_time):
-                self.id = None
+            def __init__(self, new_id, machine, order, start_time, end_time):
+                self.id = new_id
                 self.machine = machine
                 self.order = order
                 self.start_time = start_time
                 self.end_time = end_time
                 self.imported_from = None
 
             def __repr__(self):
                 return '%s_%s%r' % (db_key_name, self.__class__.__name__,
def _getOrCreateRun(self, session, run_data, machine, merge):
         run_parameters.pop('order_by', None)
         run_parameters.pop('order_id', None)
         run_parameters.pop('machine_id', None)
         run_parameters.pop('imported_from', None)
         run_parameters.pop('simple_run_id', None)
 
         # Find the order record.
         order = self._getOrCreateOrder(session, run_parameters)
+        existing_run_id = None
 
         if merge != 'append':
             existing_runs = session.query(self.Run) \
                 .filter(self.Run.machine_id == machine.id) \
                 .filter(self.Run.order_id == order.id) \
                 .all()
             if len(existing_runs) > 0:
                 if merge == 'reject':
                     raise ValueError("Duplicate submission for '%s'" %
                                      order.name)
                 elif merge == 'replace':
                     for previous_run in existing_runs:
                         logger.info("Duplicate submission for order %r: "
                                     "deleting previous run %r" %
                                     (order, previous_run))
+                        # Keep the latest ID so the URL is preserved
+                        existing_run_id = previous_run.id
+
                         session.delete(previous_run)
                 else:
                     raise ValueError('Invalid Run mergeStrategy %r' % merge)
 
         # We'd like ISO8061 timestamps, but will also accept the old format.
         try:
             start_time = aniso8601.parse_datetime(run_data['start_time'])
         except ValueError:
             start_time = datetime.datetime.strptime(run_data['start_time'],
                                                     "%Y-%m-%d %H:%M:%S")
         run_parameters.pop('start_time')
 
         try:
             end_time = aniso8601.parse_datetime(run_data['end_time'])
         except ValueError:
             end_time = datetime.datetime.strptime(run_data['end_time'],
                                                   "%Y-%m-%d %H:%M:%S")
         run_parameters.pop('end_time')
 
-        run = self.Run(machine, order, start_time, end_time)
+        new_id = existing_run_id if existing_run_id else None
+        run = self.Run(new_id, machine, order, start_time, end_time)
 
         # First, extract all of the specified run fields.
         for item in self.run_fields:
             value = run_parameters.pop(item.name, None)
             run.set_field(item, value)
 
         # Any remaining parameters are saved as a JSON encoded array.
         run.parameters = run_parameters