shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-11 05:17:41 +03:00
Code Releases Wiki Activity

F #6063: Update Backup Job fix (#2715)

Browse Source 
* Set priority on Backup Job create

* Fix a bug when running backup jobs in sequential mode

* Change the update semantics to support replace mode

* Update Ruby, Golang and Java API accordingly

* F #6063: Adress PR comments
This commit is contained in:
Pavel Czerný 2023-09-07 11:11:02 +02:00 committed by GitHub
parent 44204ebf05
commit c5392d08b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 94 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/BackupJob.h
View File

@ -232,6 +232,19 @@ public:
return _sched_actions;
}
/**
* Replace template for this object. Object should be updated
* after calling this method
* @param tmpl_str new contents
* @param keep_restricted If true, the restricted attributes of the
* current template will override the new template
* @param error string describing the error if any
* @return 0 on success
*/
int replace_template(const std::string& tmpl_str,
bool keep_restricted,
std::string& error) override;
/**
* Append new attributes to the *user template*.
* @param tmpl_str new contents
@ -255,6 +268,10 @@ protected:
*/
int post_update_template(std::string& error) override
{
remove_template_attribute("NAME");
remove_template_attribute("PRIORITY");
remove_template_attribute("SCHED_ACTION");
return parse(error);
}

9
include/RequestManagerUpdateTemplate.h
View File

@ -488,15 +488,6 @@ public:
pool = nd.get_bjpool();
auth_object = PoolObjectSQL::BACKUPJOB;
}
//Always append to BackupJob templates (not duplicated attributes)
int replace_template(PoolObjectSQL * object,
const std::string & tmpl,
const RequestAttributes &att,
std::string &error_str) override
{
return RequestManagerUpdateTemplate::append_template(object, tmpl, att, error_str);
}
};
#endif

7
src/cli/onebackupjob
View File

@ -177,10 +177,13 @@ CommandParser::CmdParser.new(ARGV) do
be launched to modify the current content.
EOT
command :update, update_desc, :backupjobid, [:file, nil] do
command :update, update_desc, :backupjobid, [:file, nil],
:options => OpenNebulaHelper::APPEND do
helper.perform_action(args[0], options, 'modified') do |obj|
if args[1]
str = File.read(args[1])
elsif options[:append]
OpenNebulaHelper.editor_input
else
rc = obj.info
@ -194,7 +197,7 @@ CommandParser::CmdParser.new(ARGV) do
str = OpenNebulaHelper.editor_input(obj.template_like_str('TEMPLATE'))
end
obj.update(str)
obj.update(str, options[:append])
end
end

5
src/oca/go/src/goca/backupjob.go
View File

@ -22,6 +22,7 @@ import (
"github.com/OpenNebula/one/src/oca/go/src/goca/schemas/backupjob"
"github.com/OpenNebula/one/src/oca/go/src/goca/schemas/shared"
"github.com/OpenNebula/one/src/oca/go/src/goca/parameters"
)
// BackupJobsController is a controller for Backup Jobs
@ -116,8 +117,8 @@ func (bjc *BackupJobsController) Create(template string) (int, error) {
// Update adds Backup Job content.
// * tpl: The new Backup Job content. Syntax can be the usual attribute=value or XML.
func (bjc *BackupJobController) Update(tpl string) error {
_, err := bjc.c.Client.Call("one.backupjob.update", bjc.ID, tpl)
func (bjc *BackupJobController) Update(tpl string, uType parameters.UpdateType) error {
_, err := bjc.c.Client.Call("one.backupjob.update", bjc.ID, tpl, uType)
return err
}

3
src/oca/go/src/goca/backupjob_test.go
View File

@ -19,6 +19,7 @@ package goca
import (
"github.com/OpenNebula/one/src/oca/go/src/goca/schemas/backupjob/keys"
"github.com/OpenNebula/one/src/oca/go/src/goca/schemas/shared"
"github.com/OpenNebula/one/src/oca/go/src/goca/parameters"
. "gopkg.in/check.v1"
)
@ -66,7 +67,7 @@ func (s *BJSuite) TestGetByNameAndID(c *C) {
func (s *BJSuite) TestUpdate(c *C) {
bjC := testCtrl.BackupJob(s.bjID)
err := bjC.Update(`BACKUP_VMS = "1,2,3,4"`)
err := bjC.Update(`BACKUP_VMS = "1,2,3,4"`, parameters.Merge)
c.Assert(err, IsNil)

10
src/oca/java/src/org/opennebula/client/bj/BackupJob.java
View File

@ -114,11 +114,12 @@ public class BackupJob extends PoolElement
* @param client XML-RPC Client.
* @param id The Backkup Job ID we want to modify.
* @param new_template New template contents
* @param append True to append new attributes instead of replace the whole template
* @return If successful the message contains the Backup Job ID.
*/
public static OneResponse update(Client client, int id, String new_template)
public static OneResponse update(Client client, int id, String new_template, boolean append)
{
return client.call(UPDATE, id, new_template);
return client.call(UPDATE, id, new_template, append ? 1 : 0);
}
/**
@ -348,11 +349,12 @@ public class BackupJob extends PoolElement
* Replaces the template contents.
*
* @param new_template New template contents
* @param append True to append new attributes instead of replace the whole template
* @return If successful the message contains the Backup Job ID.
*/
public OneResponse update(String new_template)
public OneResponse update(String new_template, boolean append)
{
return update(client, id, new_template);
return update(client, id, new_template, append);
}
/**

4
src/oca/ruby/opennebula/backupjob.rb
View File

@ -121,8 +121,8 @@ module OpenNebula
#
# @return [nil, OpenNebula::Error] nil in case of success, Error
# otherwise
def update(new_template)
super(BACKUPJOB_METHODS[:update], new_template)
def update(new_template, append = false)
super(BACKUPJOB_METHODS[:update], new_template, append ? 1 : 0)
end
# Changes the owner/group

15
src/rm/RequestManagerAllocate.cc
View File

@ -1466,6 +1466,21 @@ Request::ErrorCode BackupJobAllocate::pool_allocate(
tmpl->remove("SCHED_ACTION", sas);
int priority;
if (tmpl->get("PRIORITY", priority))
{
if (priority < BackupJob::MIN_PRIO || priority > BackupJob::MAX_PRIO)
{
att.resp_msg = "Wrong priority value";
return Request::INTERNAL;
}
if (!att.is_admin() && priority > 50)
{
return Request::AUTHORIZATION;
}
}
/* ---------------------------------------------------------------------- */
/* Create BackupJob object */
/* ---------------------------------------------------------------------- */

8
src/sam/ScheduledActionManager.cc
View File

@ -328,11 +328,10 @@ void ScheduledActionManager::backup_jobs()
continue;
}
// Copy (not reference) of outdated and backing_up vms (modified in loop)
auto vms = bj->backup_vms();
auto outdated = bj->outdated();
auto backing_up = bj->backing_up();
auto& outdated = bj->outdated();
auto& backing_up = bj->backing_up();
auto mode = bj->exec_mode();
auto ds_id = bj->ds_id();
@ -465,6 +464,9 @@ void ScheduledActionManager::backup_jobs()
GroupPool::ONEADMIN_ID,
PoolObjectSQL::VM);
NebulaLog::info("SCH", "Backup Job " + to_string(bj_id) +
" executing backup for VM " + to_string(vm_id) );
auto ec = vm_backup.request_execute(ra, vm_id, ds_id, reset);
if ( ec != Request::SUCCESS)

57
src/vm/BackupJob.cc
View File

@ -466,6 +466,32 @@ void BackupJob::get_backup_config(Template &tmpl)
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int BackupJob::replace_template(
const string& tmpl_str,
bool keep_restricted,
string& error)
{
auto new_tmpl = make_unique<VirtualMachineTemplate>(false,'=',"USER_TEMPLATE");
string new_str, backup_vms;
if ( new_tmpl->parse_str_or_xml(tmpl_str, error) != 0 )
{
return -1;
}
// Store old BACKUP_VMS value, to detect changes in post_update_template
get_template_attribute("BACKUP_VMS", backup_vms);
new_tmpl->replace("BACKUP_VMS_OLD", backup_vms);
new_tmpl->to_xml(new_str);
return PoolObjectSQL::replace_template(new_str, keep_restricted, error);
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int BackupJob::append_template(
const string& tmpl_str,
bool keep_restricted,
@ -505,6 +531,7 @@ int BackupJob::parse(string& error)
// - FSFREEZE
// - MODE
// - EXECUTION
// - PRIORITY
// -------------------------------------------------------------------------
if ( erase_template_attribute("KEEP_LAST", iattr) == 0 || iattr < 0 )
{
@ -558,7 +585,11 @@ int BackupJob::parse(string& error)
add_template_attribute("EXECUTION", execution_to_str(exec));
erase_template_attribute("PRIORITY", iattr);
if ( erase_template_attribute("PRIORITY", iattr) > 0 &&
iattr >= MIN_PRIO && iattr <= MAX_PRIO )
{
_priority = iattr;
}
// -------------------------------------------------------------------------
// VMs part of this backup job. Order represents backup order.
@ -567,8 +598,6 @@ int BackupJob::parse(string& error)
if ( erase_template_attribute("BACKUP_VMS", sattr) != 0 )
{
string sattr_old;
one_util::split(sattr, ',', vms);
auto last = std::unique(vms.begin(), vms.end());
@ -576,13 +605,6 @@ int BackupJob::parse(string& error)
vms.erase(last, vms.end());
sattr = one_util::join(vms, ',');
erase_template_attribute("BACKUP_VMS_OLD", sattr_old);
if (process_backup_vms(sattr, sattr_old, error) != 0)
{
return -1;
}
}
else
{
@ -591,15 +613,14 @@ int BackupJob::parse(string& error)
add_template_attribute("BACKUP_VMS", sattr);
if (sattr.empty())
{
return 0;
}
string sattr_old;
// -------------------------------------------------------------------------
// Remove SCHED_ACTION, it can be updated only by Scheduled Actions API
// -------------------------------------------------------------------------
remove_template_attribute("SCHED_ACTION");
erase_template_attribute("BACKUP_VMS_OLD", sattr_old);
if (process_backup_vms(sattr, sattr_old, error) != 0)
{
return -1;
}
// -------------------------------------------------------------------------
// Update collections if VMs are no longer in BACKUP_VM