IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Modify serial associator to use batch

Browse Source 
https://fedorahosted.org/freeipa/ticket/1688

The serial associator is used to execute a command multiple times with different parameters. This is used for adding/removing a user into/from multiple groups. It has some issues:

Each command is executed one-by-one, so it could be slow.
  * If there's a failure the rest of the commands will not be executed.
  * This can be fixed by putting the commands into a batch and execute them at once.
This commit is contained in:
Petr Vobornik 2011-08-25 14:57:44 +02:00 committed by Endi S. Dewata
parent beac7e2bbf
commit ddb31f5443
2 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
install/ui/association.js
View File

@ -64,28 +64,30 @@ IPA.serial_associator = function(spec) {
return; return;
} }
var value = that.values.shift(); var batch = IPA.batch_command({
if (!value) { on_success: that.on_success,
that.on_success();
return;
}
var args = [value];
var options = {};
options[that.entity.name] = that.pkey;
var command = IPA.command({
entity: that.other_entity,
method: that.method,
args: args,
options: options,
on_success: that.execute,
on_error: that.on_error on_error: that.on_error
}); });
var args, options, command;
for(var i=0; i < that.values.length; i++) {
args = [that.values[i]];
options = {};
options[that.entity.name] = that.pkey;
command = IPA.command({
entity: that.other_entity,
method: that.method,
args: args,
options: options
});
batch.add_command(command);
}
//alert(JSON.stringify(command.to_json())); //alert(JSON.stringify(command.to_json()));
command.execute(); batch.execute();
}; };
return that; return that;

27
install/ui/test/association_tests.js
View File

@ -23,11 +23,9 @@ module('association');
test("Testing serial_associator().", function() { test("Testing serial_associator().", function() {
expect(10); expect(11);
var orig_ipa_command = IPA.command; var orig_ipa_batch_command = IPA.batch_command;
var counter = 0;
var params = { var params = {
method: 'add_member', method: 'add_member',
@ -38,27 +36,34 @@ test("Testing serial_associator().", function() {
params.values = ['user1', 'user2', 'user3']; params.values = ['user1', 'user2', 'user3'];
IPA.command = function(spec) { IPA.batch_command = function(spec) {
var that = orig_ipa_command(spec); var that = orig_ipa_batch_command(spec);
that.execute = function() { that.execute = function() {
counter++; equals(that.commands.length, params.values.length,
'Checking IPA.batch_command command count');
var i, command;
for(i=0; i < params.values.length; i++) {
command = that.commands[i];
equals( equals(
that.entity, params.other_entity, command.entity, params.other_entity,
'Checking IPA.command() parameter: entity' 'Checking IPA.command() parameter: entity'
); );
equals( equals(
that.method, params.method, command.method, params.method,
'Checking IPA.command() parameter: method' 'Checking IPA.command() parameter: method'
); );
equals( equals(
that.args[0], 'user'+counter, command.args[0], 'user'+(i+1),
'Checking IPA.command() parameter: primary key' 'Checking IPA.command() parameter: primary key'
); );
}
that.on_success({}); that.on_success({});
}; };
@ -73,7 +78,7 @@ test("Testing serial_associator().", function() {
var associator = IPA.serial_associator(params); var associator = IPA.serial_associator(params);
associator.execute(); associator.execute();
IPA.command = orig_ipa_command; IPA.batch_command = orig_ipa_batch_command;
}); });
test("Testing bulk_associator().", function() { test("Testing bulk_associator().", function() {