Commit b477328dd3e180c3e0f5569ab68b230340ec7487

Authored by Sergey Matvienko
1 parent 3003ee6e

updater: verbose updateTenantAlarmsCustomer processed count

@@ -63,6 +63,7 @@ import java.util.ArrayList; @@ -63,6 +63,7 @@ import java.util.ArrayList;
63 import java.util.Collections; 63 import java.util.Collections;
64 import java.util.List; 64 import java.util.List;
65 import java.util.concurrent.ExecutionException; 65 import java.util.concurrent.ExecutionException;
  66 +import java.util.concurrent.atomic.AtomicLong;
66 import java.util.stream.Collectors; 67 import java.util.stream.Collectors;
67 68
68 import static org.apache.commons.lang3.StringUtils.isBlank; 69 import static org.apache.commons.lang3.StringUtils.isBlank;
@@ -382,6 +383,8 @@ public class DefaultDataUpdateService implements DataUpdateService { @@ -382,6 +383,8 @@ public class DefaultDataUpdateService implements DataUpdateService {
382 private final PaginatedUpdater<String, Tenant> tenantsAlarmsCustomerUpdater = 383 private final PaginatedUpdater<String, Tenant> tenantsAlarmsCustomerUpdater =
383 new PaginatedUpdater<>() { 384 new PaginatedUpdater<>() {
384 385
  386 + final AtomicLong processed = new AtomicLong();
  387 +
385 @Override 388 @Override
386 protected String getName() { 389 protected String getName() {
387 return "Tenants alarms customer updater"; 390 return "Tenants alarms customer updater";
@@ -399,12 +402,12 @@ public class DefaultDataUpdateService implements DataUpdateService { @@ -399,12 +402,12 @@ public class DefaultDataUpdateService implements DataUpdateService {
399 402
400 @Override 403 @Override
401 protected void updateEntity(Tenant tenant) { 404 protected void updateEntity(Tenant tenant) {
402 - updateTenantAlarmsCustomer(tenant.getId()); 405 + updateTenantAlarmsCustomer(tenant.getId(), getName(), processed);
403 } 406 }
404 }; 407 };
405 408
406 - private void updateTenantAlarmsCustomer(TenantId tenantId) {  
407 - AlarmQuery alarmQuery = new AlarmQuery(null, new TimePageLink(100), null, null, false); 409 + private void updateTenantAlarmsCustomer(TenantId tenantId, String name, AtomicLong processed) {
  410 + AlarmQuery alarmQuery = new AlarmQuery(null, new TimePageLink(1000), null, null, false);
408 PageData<AlarmInfo> alarms = alarmDao.findAlarms(tenantId, alarmQuery); 411 PageData<AlarmInfo> alarms = alarmDao.findAlarms(tenantId, alarmQuery);
409 boolean hasNext = true; 412 boolean hasNext = true;
410 while (hasNext) { 413 while (hasNext) {
@@ -413,6 +416,9 @@ public class DefaultDataUpdateService implements DataUpdateService { @@ -413,6 +416,9 @@ public class DefaultDataUpdateService implements DataUpdateService {
413 alarm.setCustomerId(entityService.fetchEntityCustomerId(tenantId, alarm.getOriginator())); 416 alarm.setCustomerId(entityService.fetchEntityCustomerId(tenantId, alarm.getOriginator()));
414 alarmDao.save(tenantId, alarm); 417 alarmDao.save(tenantId, alarm);
415 } 418 }
  419 + if (processed.incrementAndGet() % 1000 == 0) {
  420 + log.info("{}: {} processed so far...", name, processed);
  421 + }
416 } 422 }
417 if (alarms.hasNext()) { 423 if (alarms.hasNext()) {
418 alarmQuery.setPageLink(alarmQuery.getPageLink().nextPageLink()); 424 alarmQuery.setPageLink(alarmQuery.getPageLink().nextPageLink());