Fix runtime updates

2026-05-28 04:35:54 -04:00 · 2019-10-10 10:12:20 +02:00 · 2019-10-10 10:12:20 +02:00 · 9eff41359a
commit 9eff41359a
parent c8c50cea82
51 changed files with 57 additions and 57 deletions
--- a/configobject/configsync/configsync.go
+++ b/configobject/configsync/configsync.go
@ -100,7 +100,7 @@ func Operator(super *supervisor.Supervisor, chHA chan int, objectInformation *co
 			go UpdatePrepWorker(super, objectInformation, done, chUpdate, chUpdateBack)
 			go UpdateExecWorker(super, objectInformation, done, chUpdateBack, wgUpdate, updateCounter)

-			go RuntimeUpdateWorker(super, objectInformation, done, chInsert, chDelete, wgInsert, wgDelete)
+			go RuntimeUpdateWorker(super, objectInformation, done, chUpdate, chDelete, wgUpdate, wgDelete)

 			waitOrKill := func(wg *sync.WaitGroup, done chan struct{}) (kill bool) {
 				waitDone := make(chan bool)
@ -426,7 +426,7 @@ func UpdateExecWorker(super *supervisor.Supervisor, objectInformation *configobj
 	}
 }

-func RuntimeUpdateWorker(super *supervisor.Supervisor, objectInformation *configobject.ObjectInformation, done chan struct{}, chInsert chan []string, chDelete chan []string, wgInsert *sync.WaitGroup, wgDelete *sync.WaitGroup) {
+func RuntimeUpdateWorker(super *supervisor.Supervisor, objectInformation *configobject.ObjectInformation, done chan struct{}, chUpdate chan []string, chDelete chan []string, wgUpdate *sync.WaitGroup, wgDelete *sync.WaitGroup) {
 	subscription := super.Rdbw.Subscribe()
 	defer subscription.Close()
 	if err := subscription.Subscribe("icinga:config:delete", "icinga:config:update"); err != nil {
@ -459,19 +459,19 @@ func RuntimeUpdateWorker(super *supervisor.Supervisor, objectInformation *config
 			objectId := data[2]
 			switch msg.Channel {
 			case "icinga:config:update":
-				wgInsert.Add(1)
-				chInsert <- []string{objectId}
+				wgUpdate.Add(1)
+				chUpdate <- []string{objectId}
 				log.WithFields(log.Fields{
 					"type": 		objectInformation.ObjectType,
 					"action":		"runtime insert/update",
-				}).Infof("Inserting 1 %v on runtime update", objectInformation.ObjectType)
+				}).Infof("Inserting 1 %v on runtime update (%s)", objectInformation.ObjectType, objectId)
 			case "icinga:config:delete":
 				wgDelete.Add(1)
 				chDelete <- []string{objectId}
 				log.WithFields(log.Fields{
 					"type": 		objectInformation.ObjectType,
 					"action":		"runtime delete",
-				}).Infof("Deleting 1 %v on runtime update", objectInformation.ObjectType)
+				}).Infof("Deleting 1 %v on runtime update (%s)", objectInformation.ObjectType, objectId)
 			}
 		}
 	}
--- a/configobject/objecttypes/actionurl/actionurl.go
+++ b/configobject/objecttypes/actionurl/actionurl.go
@ -65,7 +65,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewActionUrl,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 	}
--- a/configobject/objecttypes/checkcommand/checkcommand.go
+++ b/configobject/objecttypes/checkcommand/checkcommand.go
@ -84,7 +84,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewCheckCommand,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "checkcommand",
--- a/configobject/objecttypes/checkcommand/checkcommandargument/checkcommandargument.go
+++ b/configobject/objecttypes/checkcommand/checkcommandargument/checkcommandargument.go
@ -94,7 +94,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewCheckCommandArgument,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "checkcommand",
--- a/configobject/objecttypes/checkcommand/checkcommandcustomvar/checkcommandcustomvar.go
+++ b/configobject/objecttypes/checkcommand/checkcommandcustomvar/checkcommandcustomvar.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewCheckCommandCustomvar,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "checkcommand",
--- a/configobject/objecttypes/checkcommand/checkcommandenvvar/checkcommandenvvar.go
+++ b/configobject/objecttypes/checkcommand/checkcommandenvvar/checkcommandenvvar.go
@ -73,7 +73,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewCheckCommandEnvvar,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "checkcommand",
--- a/configobject/objecttypes/customvar/customvar.go
+++ b/configobject/objecttypes/customvar/customvar.go
@ -71,7 +71,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewCustomvar,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 	}
--- a/configobject/objecttypes/customvar/customvarflat/customvarflat.go
+++ b/configobject/objecttypes/customvar/customvarflat/customvarflat.go
@ -154,7 +154,7 @@ func init() {
 		PrimaryMySqlField: "customvar_id",
 		Factory: NewCustomvarFlat,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "customvar_id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 	}
--- a/configobject/objecttypes/endpoint/endpoint.go
+++ b/configobject/objecttypes/endpoint/endpoint.go
@ -78,7 +78,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewEndpoint,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "endpoint",
--- a/configobject/objecttypes/eventcommand/eventcommand.go
+++ b/configobject/objecttypes/eventcommand/eventcommand.go
@ -84,7 +84,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewEventCommand,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "eventcommand",
--- a/configobject/objecttypes/eventcommand/eventcommandargument/eventcommandargument.go
+++ b/configobject/objecttypes/eventcommand/eventcommandargument/eventcommandargument.go
@ -94,7 +94,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewEventCommandArgument,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "eventcommand",
--- a/configobject/objecttypes/eventcommand/eventcommandcustomvar/eventcommandcustomvar.go
+++ b/configobject/objecttypes/eventcommand/eventcommandcustomvar/eventcommandcustomvar.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewEventCommandCustomvar,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "eventcommand",
--- a/configobject/objecttypes/eventcommand/eventcommandenvvar/eventcommandenvvar.go
+++ b/configobject/objecttypes/eventcommand/eventcommandenvvar/eventcommandenvvar.go
@ -73,7 +73,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewEventCommandEnvvar,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "eventcommand",
--- a/configobject/objecttypes/host/host.go
+++ b/configobject/objecttypes/host/host.go
@ -180,7 +180,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewHost,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "host",
--- a/configobject/objecttypes/host/hostcomment/hostcomment.go
+++ b/configobject/objecttypes/host/hostcomment/hostcomment.go
@ -96,7 +96,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewHostComment,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "hostcomment",
--- a/configobject/objecttypes/host/hostcustomvar/hostcustomvar.go
+++ b/configobject/objecttypes/host/hostcustomvar/hostcustomvar.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewHostCustomvar,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "host",
--- a/configobject/objecttypes/host/hostdowntime/hostdowntime.go
+++ b/configobject/objecttypes/host/hostdowntime/hostdowntime.go
@ -107,7 +107,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewHostDowntime,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "hostdowntime",
--- a/configobject/objecttypes/host/hoststate/hoststate.go
+++ b/configobject/objecttypes/host/hoststate/hoststate.go
@ -137,7 +137,7 @@ func init() {
 		PrimaryMySqlField: "host_id",
 		Factory: NewHostState,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "host_id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "host_id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "host",
--- a/configobject/objecttypes/hostgroup/hostgroup.go
+++ b/configobject/objecttypes/hostgroup/hostgroup.go
@ -84,7 +84,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewHostgroup,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "hostgroup",
--- a/configobject/objecttypes/hostgroup/hostgroupcustomvar/hostgroupcustomvar.go
+++ b/configobject/objecttypes/hostgroup/hostgroupcustomvar/hostgroupcustomvar.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewHostgroupCustomvar,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "hostgroup",
--- a/configobject/objecttypes/hostgroup/hostgroupmember/hostgroupmember.go
+++ b/configobject/objecttypes/hostgroup/hostgroupmember/hostgroupmember.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewHostgroupMember,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "host",
--- a/configobject/objecttypes/iconimage/iconimage.go
+++ b/configobject/objecttypes/iconimage/iconimage.go
@ -65,7 +65,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewIconImage,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 	}
--- a/configobject/objecttypes/notesurl/notesurl.go
+++ b/configobject/objecttypes/notesurl/notesurl.go
@ -65,7 +65,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewNotesUrl,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 	}
--- a/configobject/objecttypes/notification/notification.go
+++ b/configobject/objecttypes/notification/notification.go
@ -114,7 +114,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewNotification,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "notification",
--- a/configobject/objecttypes/notification/notificationcustomvar/notificationcustomvar.go
+++ b/configobject/objecttypes/notification/notificationcustomvar/notificationcustomvar.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewNotificationCustomvar,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "notification",
--- a/configobject/objecttypes/notification/notificationuser/notificationuser.go
+++ b/configobject/objecttypes/notification/notificationuser/notificationuser.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewNotificationUser,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "notification",
--- a/configobject/objecttypes/notification/notificationusergroup/notificationusergroup.go
+++ b/configobject/objecttypes/notification/notificationusergroup/notificationusergroup.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewNotificationUsergroup,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "notification",
--- a/configobject/objecttypes/notificationcommand/notificationcommand.go
+++ b/configobject/objecttypes/notificationcommand/notificationcommand.go
@ -84,7 +84,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewNotificationCommand,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "notificationcommand",
--- a/configobject/objecttypes/notificationcommand/notificationcommandargument/notificationcommandargument.go
+++ b/configobject/objecttypes/notificationcommand/notificationcommandargument/notificationcommandargument.go
@ -94,7 +94,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewNotificationCommandArgument,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "notificationcommand",
--- a/configobject/objecttypes/notificationcommand/notificationcommandcustomvar/notificationcommandcustomvar.go
+++ b/configobject/objecttypes/notificationcommand/notificationcommandcustomvar/notificationcommandcustomvar.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewNotificationCommandCustomvar,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "notificationcommand",
--- a/configobject/objecttypes/notificationcommand/notificationcommandenvvar/notificationcommandenvvar.go
+++ b/configobject/objecttypes/notificationcommand/notificationcommandenvvar/notificationcommandenvvar.go
@ -73,7 +73,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewNotificationCommandEnvvar,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "notificationcommand",
--- a/configobject/objecttypes/service/service.go
+++ b/configobject/objecttypes/service/service.go
@ -171,7 +171,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewService,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "service",
--- a/configobject/objecttypes/service/servicecomment/servicecomment.go
+++ b/configobject/objecttypes/service/servicecomment/servicecomment.go
@ -96,7 +96,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewServiceComment,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "servicecomment",
--- a/configobject/objecttypes/service/servicecustomvar/servicecustomvar.go
+++ b/configobject/objecttypes/service/servicecustomvar/servicecustomvar.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewServiceCustomvar,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "service",
--- a/configobject/objecttypes/service/servicedowntime/servicedowntime.go
+++ b/configobject/objecttypes/service/servicedowntime/servicedowntime.go
@ -107,7 +107,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewServiceDowntime,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "servicedowntime",
--- a/configobject/objecttypes/service/servicestate/servicestate.go
+++ b/configobject/objecttypes/service/servicestate/servicestate.go
@ -137,7 +137,7 @@ func init() {
 		PrimaryMySqlField: "service_id",
 		Factory: NewServiceState,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "service_id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "service_id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "service",
--- a/configobject/objecttypes/servicegroup/servicegroup.go
+++ b/configobject/objecttypes/servicegroup/servicegroup.go
@ -84,7 +84,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewServicegroup,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "servicegroup",
--- a/configobject/objecttypes/servicegroup/servicegroupcustomvar/servicegroupcustomvar.go
+++ b/configobject/objecttypes/servicegroup/servicegroupcustomvar/servicegroupcustomvar.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewServicegroupCustomvar,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "servicegroup",
--- a/configobject/objecttypes/servicegroup/servicegroupmember/servicegroupmember.go
+++ b/configobject/objecttypes/servicegroup/servicegroupmember/servicegroupmember.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewServicegroupMember,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "service",
--- a/configobject/objecttypes/timeperiod/timeperiod.go
+++ b/configobject/objecttypes/timeperiod/timeperiod.go
@ -84,7 +84,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewTimeperiod,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "timeperiod",
--- a/configobject/objecttypes/timeperiod/timeperiodcustomvar/timeperiodcustomvar.go
+++ b/configobject/objecttypes/timeperiod/timeperiodcustomvar/timeperiodcustomvar.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewTimeperiodCustomvar,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "timeperiod",
--- a/configobject/objecttypes/timeperiod/timeperiodoverrideexclude/timeperiodoverrideexclude.go
+++ b/configobject/objecttypes/timeperiod/timeperiodoverrideexclude/timeperiodoverrideexclude.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewTimeperiodOverrideExclude,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "timeperiod",
--- a/configobject/objecttypes/timeperiod/timeperiodoverrideinclude/timeperiodoverrideinclude.go
+++ b/configobject/objecttypes/timeperiod/timeperiodoverrideinclude/timeperiodoverrideinclude.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewTimeperiodOverrideInclude,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "timeperiod",
--- a/configobject/objecttypes/timeperiod/timeperiodrange/timeperiodrange.go
+++ b/configobject/objecttypes/timeperiod/timeperiodrange/timeperiodrange.go
@ -70,7 +70,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewTimeperiodRange,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "timeperiod",
--- a/configobject/objecttypes/user/user.go
+++ b/configobject/objecttypes/user/user.go
@ -105,7 +105,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewUser,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "user",
--- a/configobject/objecttypes/user/usercustomvar/usercustomvar.go
+++ b/configobject/objecttypes/user/usercustomvar/usercustomvar.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewUserCustomvar,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "user",
--- a/configobject/objecttypes/usergroup/usergroup.go
+++ b/configobject/objecttypes/usergroup/usergroup.go
@ -84,7 +84,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewUsergroup,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "usergroup",
--- a/configobject/objecttypes/usergroup/usergroupcustomvar/usergroupcustomvar.go
+++ b/configobject/objecttypes/usergroup/usergroupcustomvar/usergroupcustomvar.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewUsergroupCustomvar,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "usergroup",
--- a/configobject/objecttypes/usergroup/usergroupmember/usergroupmember.go
+++ b/configobject/objecttypes/usergroup/usergroupmember/usergroupmember.go
@ -67,7 +67,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewUsergroupMember,
 		HasChecksum: false,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "user",
--- a/configobject/objecttypes/zone/zone.go
+++ b/configobject/objecttypes/zone/zone.go
@ -87,7 +87,7 @@ func init() {
 		PrimaryMySqlField: "id",
 		Factory: NewZone,
 		HasChecksum: true,
-		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields, "id"),
+		BulkInsertStmt: connection.NewBulkInsertStmt(name, Fields),
 		BulkDeleteStmt: connection.NewBulkDeleteStmt(name,  "id"),
 		BulkUpdateStmt: connection.NewBulkUpdateStmt(name, Fields),
 		NotificationListenerType: "zone",
--- a/connection/mysql_utils.go
+++ b/connection/mysql_utils.go
@ -376,11 +376,11 @@ type BulkInsertStmt struct {
 	NumField    int
 }

-func NewBulkInsertStmt(table string, fields []string, primaryKey string) *BulkInsertStmt {
+func NewBulkInsertStmt(table string, fields []string) *BulkInsertStmt {
 	numField := len(fields)
 	placeholder := fmt.Sprintf("(%s)", strings.TrimSuffix(strings.Repeat("?, ", numField), ", "))
 	stmt := BulkInsertStmt{
-		Format:      fmt.Sprintf("INSERT INTO %s (%s) VALUES %s ON DUPLICATE KEY UPDATE %s = %s", table, strings.Join(fields, ", "), "%s", primaryKey, primaryKey),
+		Format:      fmt.Sprintf("REPLACE INTO %s (%s) VALUES %s", table, strings.Join(fields, ", "), "%s"),
 		Fields:      fields,
 		Placeholder: placeholder,
 		NumField:    numField,