BF: CS-1163 when a queue is signalled then additional invalid entries are created in the berkeleydb spooling database

Author: jgabler-hpc

source/daemons/qmaster/sge_qmaster_process_message.cc

@@ -753,8 +753,11 @@ sge_c_job_ack(const char *host, const char *commproc, u_long32 ack_tag,
 
          lSetUlong(qinstance, QU_pending_signal, 0);
          te_delete_one_time_event(TYPE_SIGNAL_RESEND_EVENT, 0, 0, lGetString(qinstance, QU_full_name));
+         DSTRING_STATIC(dstr, MAX_STRING_SIZE);
+         const char *key = sge_dstring_sprintf(&dstr, "%s/%s", lGetString(qinstance, QU_qname),
+                                               lGetHost(qinstance, QU_qhostname));
          spool_write_object(&answer_list, spool_get_default_context(), qinstance,
-                            lGetString(qinstance, QU_full_name), SGE_TYPE_QINSTANCE, true);
+                            key, SGE_TYPE_QINSTANCE, true);
          answer_list_output(&answer_list);
          break;
       }

source/libs/spool/berkeleydb/sge_bdb.cc

@@ -1479,7 +1479,7 @@ spool_berkeleydb_delete_cqueue(lList **answer_list, bdb_info info,
 
    if (ret) {
       table_name = object_type_get_name(SGE_TYPE_QINSTANCE);
-      dbkey = sge_dstring_sprintf(&dbkey_dstring, "%s:%s@", table_name, key);
+      dbkey = sge_dstring_sprintf(&dbkey_dstring, "%s:%s/", table_name, key);
       ret = spool_berkeleydb_delete_object(answer_list, info, BDB_CONFIG_DB,
                                            dbkey, true);
    }