sipwise
/
ngcp-panel
mirror of https://github.com/sipwise/ngcp-panel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#57708 sound set/file use READ COMMITTED

Browse Source 
* as changes to sound sets and sound files cause
  internal triggers + SP to be invoked, the gap
  locking should be reduced to avoid possible
  deadlocks, hence READ COMMITTED transaction
  isolation level is used for all sound sets
  and sound files change operations.
* fix a condition that caused an evaluation error
  when both old_parent_id and parent_id are undef.

Change-Id: I7e69a0a0e5878c03b086977933315e532aaa2a29
mr12.0
Kirill Solomko 2 years ago
parent a2270e19b8
commit 22a8e95c29
6 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
lib/NGCP/Panel/Controller/API/SoundFiles.pm
Unescape View File

@ -53,6 +53,7 @@ sub relation{
__PACKAGE__->set_config({
allowed_roles => [qw/admin reseller subscriberadmin/],
set_transaction_isolation => 'READ COMMITTED',
});
sub auto :Private {
@ -108,6 +109,7 @@ sub GET :Allow {
sub POST :Allow {
my ($self, $c) = @_;
$c->model('DB')->set_transaction_isolation('READ COMMITTED');
my $guard = $c->model('DB')->txn_scope_guard;
{
my ($recording, $resource);

6
lib/NGCP/Panel/Controller/API/SoundFilesItem.pm
Unescape View File

@ -31,6 +31,7 @@ sub relation{
__PACKAGE__->set_config({
allowed_roles => [qw/admin reseller subscriberadmin/],
set_transaction_isolation => 'READ COMMITTED',
});
sub GET :Allow {
@ -57,6 +58,8 @@ sub GET :Allow {
sub PUT :Allow {
my ($self, $c, $id) = @_;
$c->model('DB')->set_transaction_isolation('READ COMMITTED');
my $guard = $c->model('DB')->txn_scope_guard;
{
my $preference = $self->require_preference($c);
@ -87,6 +90,8 @@ sub PUT :Allow {
sub PATCH :Allow {
my ($self, $c, $id) = @_;
$c->model('DB')->set_transaction_isolation('READ COMMITTED');
my $guard = $c->model('DB')->txn_scope_guard;
{
my $preference = $self->require_preference($c);
@ -119,6 +124,7 @@ sub PATCH :Allow {
sub DELETE :Allow {
my ($self, $c, $id) = @_;
$c->model('DB')->set_transaction_isolation('READ COMMITTED');
my $guard = $c->model('DB')->txn_scope_guard;
{
my $item = $self->item_by_id($c, $id);

1
lib/NGCP/Panel/Controller/API/SoundSets.pm
Unescape View File

@ -8,6 +8,7 @@ use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::SoundSets/;
__PACKAGE__->set_config({
allowed_roles => [qw/admin reseller subscriberadmin/],
set_transaction_isolation => 'READ COMMITTED',
});
sub allowed_methods{

3
lib/NGCP/Panel/Controller/API/SoundSetsItem.pm
Unescape View File

@ -11,7 +11,8 @@ __PACKAGE__->set_config({
allowed_roles => {
Default => [qw/admin reseller subscriberadmin/],
Journal => [qw/admin reseller subscriberadmin/],
}
},
set_transaction_isolation => 'READ COMMITTED',
});
sub allowed_methods{

40
lib/NGCP/Panel/Controller/Sound.pm
Unescape View File

@ -271,6 +271,7 @@ sub edit :Chained('base') :PathPart('edit') {
die "an attempt to edit a sound set that does not belong to the subscriberadmin";
}
$c->model('DB')->set_transaction_isolation('READ COMMITTED');
$c->model('DB')->txn_do(sub {
if ($c->stash->{set_result}->expose_to_customer == 1 &&
$form->values->{expose_to_customer} == 0) {
@ -298,7 +299,7 @@ sub edit :Chained('base') :PathPart('edit') {
# invalidate cache of this sound set if parent is changed
if ((!$old_parent_id && $parent_id) ||
($old_parent_id && !$parent_id) ||
$old_parent_id != $parent_id) {
($old_parent_id && $parent_id && $old_parent_id != $parent_id)) {
NGCP::Panel::Utils::Sems::clear_audio_cache($c, $own_id);
}
@ -336,6 +337,7 @@ sub delete_sound :Chained('base') :PathPart('delete') {
try {
my $schema = $c->model('DB');
$schema->set_transaction_isolation('READ COMMITTED');
$schema->txn_do(sub {
my $own_id = $c->stash->{set_result}->id;
@ -453,6 +455,7 @@ sub create :Chained('sets_list') :PathPart('create') :Args() {
delete $form->values->{parent};
my $schema = $c->model('DB');
$schema->set_transaction_isolation('READ COMMITTED');
$schema->txn_do(sub {
# if a new contract default is set, clear old ones first
if($form->values->{contract_id} && $form->values->{contract_default} == 1) {
@ -589,7 +592,6 @@ sub handles_edit :Chained('handles_base') :PathPart('edit') {
if($posted && $form->validated) {
# only if the form is validated and a POST is issued, insert the sound file in the db
$file_result->insert();
if (defined $upload) {
my $soundfile = eval { $upload->slurp };
my $filename = eval { $upload->filename };
@ -619,12 +621,17 @@ sub handles_edit :Chained('handles_base') :PathPart('edit') {
}
try {
$file_result->update({
loopplay => $form->values->{loopplay},
use_parent => $form->values->{use_parent},
filename => $filename,
data => $soundfile,
codec => $target_codec,
my $schema = $c->model('DB');
$schema->set_transaction_isolation('READ COMMITTED');
$schema->txn_do(sub {
$file_result->insert();
$file_result->update({
loopplay => $form->values->{loopplay},
use_parent => $form->values->{use_parent},
filename => $filename,
data => $soundfile,
codec => $target_codec,
});
});
NGCP::Panel::Utils::Message::info(
c => $c,
@ -639,9 +646,14 @@ sub handles_edit :Chained('handles_base') :PathPart('edit') {
}
} else {
try {
$file_result->update({
loopplay => $form->values->{loopplay},
use_parent => $form->values->{use_parent},
my $schema = $c->model('DB');
$schema->set_transaction_isolation('READ COMMITTED');
$schema->txn_do(sub {
$file_result->insert();
$file_result->update({
loopplay => $form->values->{loopplay},
use_parent => $form->values->{use_parent},
});
});
NGCP::Panel::Utils::Message::info(
c => $c,
@ -683,7 +695,11 @@ sub handles_delete :Chained('handles_base') :PathPart('delete') {
$self->check_subadmin_handle_edit_access($c, $c->stash->{file_result});
try {
$c->stash->{file_result}->delete;
my $schema = $c->model('DB');
$schema->set_transaction_isolation('READ COMMITTED');
$schema->txn_do(sub {
$c->stash->{file_result}->delete;
});
NGCP::Panel::Utils::Message::info(
c => $c,
data => { $c->stash->{file_result}->get_inflated_columns },

2
lib/NGCP/Panel/Role/API/SoundSets.pm
Unescape View File

@ -188,7 +188,7 @@ sub update_item_model {
my $parent_id = $resource->{parent_id};
if ((!$old_parent_id && $parent_id) ||
($old_parent_id && !$parent_id) ||
$old_parent_id != $parent_id) {
($old_parent_id && $parent_id && $old_parent_id != $parent_id)) {
NGCP::Panel::Utils::Sems::clear_audio_cache($c, $item->id);
}

Write Preview
Loading…
Cancel
Save