Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ProActive
scheduling
Commits
7c2e1ace
Unverified
Commit
7c2e1ace
authored
May 12, 2020
by
Fabien Viale
Committed by
GitHub
May 12, 2020
Browse files
Merge pull request #3755 from fviale/master
install script : fix job planner housekeeping configuration
parents
e6392db3
ded9e325
Changes
3
Hide whitespace changes
Inline
Side-by-side
config/security.java.policy-server
View file @
7c2e1ace
...
...
@@ -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";
...
...
scheduler/scheduler-server/src/main/java/org/ow2/proactive/scheduler/core/db/JobData.java
View file @
7c2e1ace
...
...
@@ -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
;
...
...
tools/install_base.sh
View file @
7c2e1ace
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment