Unverified Commit 7c2e1ace authored by Fabien Viale's avatar Fabien Viale Committed by GitHub
Browse files

Merge pull request #3755 from fviale/master

install script : fix job planner housekeeping configuration
parents e6392db3 ded9e325
......@@ -162,6 +162,8 @@ grant principal org.ow2.proactive.authentication.principals.GroupNamePrincipal "
permission org.ow2.proactive.permissions.MethodCallPermission "org.ow2.proactive.scheduler.core.SchedulerFrontend.putThirdPartyCredential";
permission org.ow2.proactive.permissions.MethodCallPermission "org.ow2.proactive.scheduler.core.SchedulerFrontend.thirdPartyCredentialsKeySet";
permission org.ow2.proactive.permissions.MethodCallPermission "org.ow2.proactive.scheduler.core.SchedulerFrontend.removeThirdPartyCredential";
permission org.ow2.proactive.permissions.MethodCallPermission "org.ow2.proactive.scheduler.core.SchedulerFrontend.checkFileExists";
permission org.ow2.proactive.permissions.MethodCallPermission "org.ow2.proactive.scheduler.core.SchedulerFrontend.isFolder";
// API - access to database
permission java.sql.SQLPermission "setLog";
......
......@@ -342,7 +342,7 @@ public class JobData implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "JOBID_SEQUENCE")
@SequenceGenerator(name = "JOBID_SEQUENCE", sequenceName = "JOBID_SEQUENCE")
@SequenceGenerator(name = "JOBID_SEQUENCE", sequenceName = "JOBID_SEQUENCE", allocationSize = 1, initialValue = 1)
@Column(name = "ID")
public Long getId() {
return id;
......
......@@ -484,7 +484,7 @@ if [[ "$OLD_PADIR" == "" ]]; then
sed "s/pa\.scheduler\.job\.removeFromDataBase=.*/pa.scheduler.job.removeFromDataBase=true/g" -i "$PA_ROOT/default/config/scheduler/settings.ini"
sed "s/^#pa\.rm\.history\.maxperiod=.*/pa.rm.history.maxperiod=$JOB_CLEANUP_SECONDS/g" -i "$PA_ROOT/default/config/rm/settings.ini"
sed "s/^notifications\.housekeeping\.removedelay=.*/notifications.housekeeping.removedelay=$JOB_CLEANUP_SECONDS/g" -i "$PA_ROOT/default/dist/war/notification-service/WEB-INF/classes/application.properties"
sed "s/^pa\.job\.execution\.history\.maxperiod=.*/pa.job.execution.history.maxperiod=$JOB_CLEANUP_SECONDS/g" -i "$PA_ROOT/default/dist/war/job-planner/WEB-INF/classes/application.properties"
sed "s/^#pa\.job\.execution\.history\.maxperiod=.*/pa.job.execution.history.maxperiod=$JOB_CLEANUP_SECONDS/g" -i "$PA_ROOT/default/dist/war/job-planner/WEB-INF/classes/application.properties"
# Cleanup extra log files older than the given period
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment