Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #22378: Generate policies for campaigns before it starts officially, delete them after it stops (1 hour delay each) #4666

Merged
merged 1 commit into from
Feb 16, 2023
Merged

Fixes #22378: Generate policies for campaigns before it starts officially, delete them after it stops (1 hour delay each) #4666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 30 additions & 18 deletions ...udder/rudder-core/src/main/scala/com/normation/rudder/campaigns/MainCampaignService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,13 @@ object MainCampaignService {
}
}

class MainCampaignService(repo: CampaignEventRepository, campaignRepo: CampaignRepository, uuidGen: StringUuidGenerator) {
class MainCampaignService(
repo: CampaignEventRepository,
campaignRepo: CampaignRepository,
uuidGen: StringUuidGenerator,
startDelay: Int,
endDelay: Int
) {

private[this] var services: List[CampaignHandler] = Nil
def registerService(s: CampaignHandler) = {
Expand Down Expand Up @@ -174,14 +180,15 @@ class MainCampaignService(repo: CampaignEventRepository, campaignRepo: CampaignR
event.copy(state = Skipped(s"Event was cancelled because campaign is archived. ${reasonMessage}"))
)
case Enabled =>
if (event.start.isAfter(now)) {
val effectiveStart = event.start.minusHours(startDelay)
if (effectiveStart.isAfter(now)) {
for {
_ <-
CampaignLogger.debug(
s"Scheduled Campaign event ${event.id.value} put to sleep until it should start, on ${DateFormaterService
.serialize(event.start)}"
.serialize(effectiveStart)}, ${startDelay} hour${if (startDelay > 1) "s" else ""} before official start date, to ensure policies are correctly dispatched, nothing will be applied on the node"
)
_ <- ZIO.sleep(Duration.fromMillis(event.start.getMillis - now.getMillis))
_ <- ZIO.sleep(Duration.fromMillis(effectiveStart.getMillis - now.getMillis))
} yield {
().succeed
}
Expand All @@ -192,30 +199,35 @@ class MainCampaignService(repo: CampaignEventRepository, campaignRepo: CampaignR
}
}
case Running =>
if (event.start.isAfter(now)) {
val effectiveStart = event.start.minusHours(startDelay)
val effectiveEnd = event.end.plusHours(endDelay)
if (effectiveStart.isAfter(now)) {
for {
// Campaign should be planned, not running
_ <-
CampaignLogger.warn(
s"Campaign event ${event.id.value} was considered Running but we are before it start date, setting state to Schedule and wait for event to start, on ${DateFormaterService
.serialize(event.start)}"
s"Campaign event ${event.id.value} was considered Running but we are before its start date, setting state to Schedule and wait for event to start, on ${DateFormaterService
.serialize(effectiveStart)}, ${startDelay} hour${if (startDelay > 1) "s" else ""} before official start date, to ensure policies are correctly dispatched, nothing will be applied on the node"
)
_ <- repo.saveCampaignEvent(event.copy(state = Scheduled))
_ <- CampaignLogger.debug(
s"Scheduled Campaign event ${event.id.value} put to sleep until it should start, on ${DateFormaterService
.serialize(event.start)}"
)
_ <- ZIO.sleep(Duration.fromMillis(event.start.getMillis - now.getMillis))
_ <-
CampaignLogger.debug(
s"Scheduled Campaign event ${event.id.value} put to sleep until it should start, on ${DateFormaterService
.serialize(effectiveStart)}, ${startDelay} hour${if (startDelay > 1) "s" else ""} before official start date, to ensure policies are correctly dispatched, nothing will be applied on the node"
)

_ <- ZIO.sleep(Duration.fromMillis(effectiveStart.getMillis - now.getMillis))
} yield {
()
}
} else if (event.end.isAfter(now)) {
} else if (effectiveEnd.isAfter(now)) {
for {
_ <- CampaignLogger.debug(
s"Running Campaign event ${event.id.value} put to sleep until it should end, on ${DateFormaterService
.serialize(event.end)}"
)
_ <- ZIO.sleep(Duration.fromMillis(event.end.getMillis - now.getMillis))
_ <-
CampaignLogger.debug(
s"Running Campaign event ${event.id.value} put to sleep until it should end, on ${DateFormaterService
.serialize(effectiveEnd)}, ${endDelay} hour${if (endDelay > 1) "s" else ""} after official end date, so that we can gather results"
)
_ <- ZIO.sleep(Duration.fromMillis(effectiveEnd.getMillis - now.getMillis))
} yield {
()
}
Expand Down
2 changes: 1 addition & 1 deletion webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/hooks/RunHooks.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ object RunHooks {
case Some(ok) =>
ok.succeed
case None =>
val msg = s"Hook ${cmdInfo} timed out after ${killTimeout.asJava.toString}"
val msg = s"Hook ${cmdInfo} timed out after ${killTimeout.render}"
PureHooksLogger.LongExecLogger.error(msg) *> Unexpected(msg).fail
}
.untraced
Expand Down
2 changes: 1 addition & 1 deletion webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3195,6 +3195,6 @@ class MockCampaign() {
}
}

val mainCampaignService = new MainCampaignService(dumbCampaignEventRepository, repo, new StringUuidGeneratorImpl())
val mainCampaignService = new MainCampaignService(dumbCampaignEventRepository, repo, new StringUuidGeneratorImpl(), 0, 0)

}
2 changes: 1 addition & 1 deletion webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2920,7 +2920,7 @@ object RudderConfig extends Loggable {
.make(campaignSerializer, campaignPath, campaignEventRepo)
.runOrDie(err => new RuntimeException(s"Error during initialization of campaign repository: " + err.fullMsg))

val mainCampaignService = new MainCampaignService(campaignEventRepo, campaignRepo, uuidGen)
val mainCampaignService = new MainCampaignService(campaignEventRepo, campaignRepo, uuidGen, 1, 1)
lazy val jsonReportsAnalyzer = JSONReportsAnalyser(reportsRepository, propertyRepository)

// todo: scheduler interval should be a property
Expand Down