mir/vinyldns
2
0
Fork 0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-08-22 02:02:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1374 from Jay07GIT/latency_fix_batch_change

Browse Source 
Fix for latency issue in batch change upload
This commit is contained in:
Nicholas Spadaccino 2024-08-14 21:19:40 -04:00 committed by GitHub
commit 7d9937d4af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 60 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/docker/api/application.conf
View File

@ -351,6 +351,10 @@ akka.http {
# Set to `infinite` to disable.
bind-timeout = 5s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on
}

4
modules/api/src/it/resources/application.conf
View File

@ -348,6 +348,10 @@ akka.http {
# Set to `infinite` to disable.
bind-timeout = 5s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on
}

4
modules/api/src/main/resources/application.conf
View File

@ -367,6 +367,10 @@ akka.http {
# Set to `infinite` to disable.
bind-timeout = 5s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on
}

4
modules/api/src/universal/conf/application.conf
View File

@ -352,6 +352,10 @@ akka.http {
# Set to `infinite` to disable.
bind-timeout = 5s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on
}

5
modules/docs/src/main/mdoc/operator/config-api.md
View File

@ -990,7 +990,10 @@ dotted-hosts = {
# The time period within which the TCP binding process must be completed.
# Set to `infinite` to disable.
bind-timeout = 5s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on
}

14
modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
View File

@ -17,9 +17,9 @@
package vinyldns.mysql.repository
import java.sql.Timestamp
import cats.data._
import cats.effect._
import java.time.Instant
import org.slf4j.LoggerFactory
import scalikejdbc._
@ -166,8 +166,8 @@ class MySqlBatchChangeRepository
}
def getBatchFromSingleChangeId(
singleChangeId: String
)(implicit s: DBSession): Option[BatchChange] =
singleChangeId: String
)(implicit s: DBSession): Option[BatchChange] =
GET_BATCH_CHANGE_METADATA_FROM_SINGLE_CHANGE
.bind(singleChangeId)
.map(extractBatchChange(None))
@ -181,12 +181,9 @@ class MySqlBatchChangeRepository
.apply()
batchMeta.copy(changes = changes)
}
monitor("repo.BatchChangeJDBC.updateSingleChanges") {
IO {
logger.info(
s"Updating single change statuses: ${singleChanges.map(ch => (ch.id, ch.status))}"
)
logger.info(s"Updating single change status: ${singleChanges.map(ch => (ch.id, ch.status))}")
DB.localTx { implicit s =>
for {
headChange <- singleChanges.headOption
@ -194,8 +191,7 @@ class MySqlBatchChangeRepository
_ = UPDATE_SINGLE_CHANGE.batchByName(batchParams: _*).apply()
batchChange <- getBatchFromSingleChangeId(headChange.id)
} yield batchChange
}
}
}}
}
}

2
modules/portal/app/models/Meta.scala
View File

@ -32,7 +32,7 @@ object Meta {
Meta(
config.getOptional[String]("vinyldns.version").getOrElse("unknown"),
config.getOptional[Boolean]("shared-display-enabled").getOrElse(false),
config.getOptional[Int]("batch-change-limit").getOrElse(1000),
config.getOptional[Int]("api.limits.batchchange-routing-max-items-limit").getOrElse(1000),
config.getOptional[Long]("default-ttl").getOrElse(7200L),
config.getOptional[Boolean]("manual-batch-review-enabled").getOrElse(false),
config.getOptional[Boolean]("scheduled-changes-enabled").getOrElse(false),

5
modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html
View File

@ -326,7 +326,7 @@
<label class="batch-change-csv-label btn btn-default" for="batchChangeCsv" id="batchChangeCsvImportLabel">
<span><span class="glyphicon glyphicon-import"></span> Import CSV</span>
</label>
<input type="file" id="batchChangeCsv" ng-model="csvInput" name="batchChangeCsv" class="batchChangeCsv" ng-change="uploadCSV(createBatchChangeForm.batchChangeCsv.$viewValue)" batch-change-file>
<input type="file" id="batchChangeCsv" ng-model="csvInput" name="batchChangeCsv" class="batchChangeCsv" ng-change="uploadCSV(createBatchChangeForm.batchChangeCsv.$viewValue, batchChangeLimit )" batch-change-file>
<p><a href="https://www.vinyldns.io/portal/dns-changes#dns-change-csv-import" target="_blank" rel="noopener noreferrer">See documentation for sample CSV</a></p>
</div>
<p ng-if="newBatch.changes.length >= batchChangeLimit">Limit reached. Cannot add more than {{batchChangeLimit}} records per DNS change.</p>
@ -336,6 +336,9 @@
<button type="button" id="create-batch-changes-button" class="btn btn-primary" ng-click="submitChange(manualReviewEnabled)">Submit</button>
</div>
<div ng-if="formStatus=='pendingConfirm'" class="pull-right">
<div class="modal fade" id="loader" tabindex="-1" role="dialog" >
<div class="spinner" ></div>
</div>
<span ng-if="!batchChangeErrors">{{ confirmationPrompt }}</span>
<span ng-if="batchChangeErrors" class="batch-change-error-help">There were errors, please review the highlighted rows and then proceed.</span>
<button class="btn btn-default" ng-click="cancelSubmit()">Cancel</button>

16
modules/portal/public/lib/dns-change/dns-change-new.controller.js
View File

@ -44,6 +44,7 @@
$scope.manualReviewEnabled;
$scope.naptrFlags = ["U", "S", "A", "P"];
$scope.addSingleChange = function() {
$scope.newBatch.changes.push({changeType: "Add", type: "A+PTR"});
var changesLength = $scope.newBatch.changes.length;
@ -161,14 +162,14 @@
$scope.alerts.push(alert);
}
$scope.uploadCSV = function(file) {
parseFile(file).then(function(dataLength){
$scope.alerts.push({type: 'success', content: 'Successfully imported ' + dataLength + ' changes.' });
$scope.uploadCSV = function(file, batchChangeLimit) {
parseFile(file, batchChangeLimit).then(function(dataLength){
$scope.alerts.push({type: 'success', content: 'Successfully imported ' + dataLength + ' DNS changes.' });
}, function(error) {
$scope.alerts.push({type: 'danger', content: error});
});
function parseFile(file) {
function parseFile(file, batchChangeLimit) {
return $q(function(resolve, reject) {
if (!file.name.endsWith('.csv')) {
reject("Import failed. File should be of ‘.csv’ type.");
@ -177,6 +178,9 @@
var reader = new FileReader();
reader.onload = function(e) {
var rows = e.target.result.split("\n");
if(rows.length - 1 > batchChangeLimit)
{reject("Import failed. Cannot add more than " + batchChangeLimit + " records per DNS change.");
} else {
if (rows[0].trim() == "Change Type,Record Type,Input Name,TTL,Record Data") {
$scope.newBatch.changes = [];
for(var i = 1; i < rows.length; i++) {
@ -186,10 +190,10 @@
}
$scope.$apply()
resolve($scope.newBatch.changes.length);
} else {
} else {
reject("Import failed. CSV header must be: Change Type,Record Type,Input Name,TTL,Record Data");
}
}
}}
reader.readAsText(file);
}
});

12
modules/portal/public/lib/dns-change/dns-change.service.js
View File

@ -30,7 +30,17 @@
"allowManualReview": allowManualReview
}
var url = utilityService.urlBuilder('/api/dnschanges', params);
return $http.post(url, data, {headers: utilityService.getCsrfHeader()});
let loader = $("#loader");
loader.modal({
backdrop: "static",
keyboard: false, //remove option to close with keyboard
show: true //Display loader!
})
let promis = $http.post(url, data, {headers: utilityService.getCsrfHeader()});
// Hide loader when api gets response
promis.then(()=>loader.modal("hide"))
.catch(()=>loader.modal("hide"))
return promis
};
this.getBatchChanges = function (maxItems, startFrom, ignoreAccess, approvalStatus, userName, dateTimeRangeStart, dateTimeRangeEnd) {

2
modules/portal/test/models/MetaSpec.scala
View File

@ -34,7 +34,7 @@ class MetaSpec extends Specification with Mockito {
Meta(Configuration.from(config)).sharedDisplayEnabled must beTrue
}
"get the batch-change-limit value in config" in {
val config = Map("batch-change-limit" -> 21)
val config = Map("api.limits.batchchange-routing-max-items-limit" -> 21)
Meta(Configuration.from(config)).batchChangeLimit must beEqualTo(21)
}
"default to 1000 if batch-change-limit is not found" in {

4
test/api/functional/application.conf
View File

@ -302,6 +302,10 @@ akka.http {
# Set to `infinite` to disable.
bind-timeout = 5s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on
}

4
test/api/integration/application.conf
View File

@ -360,6 +360,10 @@ akka.http {
# Set to `infinite` to disable.
bind-timeout = 5s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on
}