Skip to content

Commit c1db7b9

Browse files
ivanzlenkoivanzlenko
committed
HDDS-12413. Revert changes to validate
1 parent 2bcbd0f commit c1db7b9

1 file changed

Lines changed: 55 additions & 79 deletions

File tree

‎hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeConfiguration.java‎

Lines changed: 55 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -548,159 +548,135 @@ public class DatanodeConfiguration extends ReconfigurableConfig {
548548
@PostConstruct
549549
public void validate() {
550550
if (containerDeleteThreads < 1) {
551-
LOG.warn("{} must be greater than zero and was set to {}. Defaulting to {}",
552-
CONTAINER_DELETE_THREADS_MAX_KEY,
553-
containerDeleteThreads,
554-
CONTAINER_DELETE_THREADS_DEFAULT);
555-
551+
LOG.warn(CONTAINER_DELETE_THREADS_MAX_KEY + " must be greater than zero" +
552+
" and was set to {}. Defaulting to {}",
553+
containerDeleteThreads, CONTAINER_DELETE_THREADS_DEFAULT);
556554
containerDeleteThreads = CONTAINER_DELETE_THREADS_DEFAULT;
557555
}
558556

559557
if (containerCloseThreads < 1) {
560-
LOG.warn("{} must be greater than zero and was set to {}. Defaulting to {}",
561-
CONTAINER_CLOSE_THREADS_MAX_KEY,
562-
containerCloseThreads,
563-
CONTAINER_CLOSE_THREADS_DEFAULT);
564-
558+
LOG.warn(CONTAINER_CLOSE_THREADS_MAX_KEY + " must be greater than zero" +
559+
" and was set to {}. Defaulting to {}",
560+
containerCloseThreads, CONTAINER_CLOSE_THREADS_DEFAULT);
565561
containerCloseThreads = CONTAINER_CLOSE_THREADS_DEFAULT;
566562
}
567563

568564
if (periodicDiskCheckIntervalMinutes < 1) {
569-
LOG.warn("{} must be greater than zero and was set to {}. Defaulting to {}",
570-
PERIODIC_DISK_CHECK_INTERVAL_MINUTES_KEY,
565+
LOG.warn(PERIODIC_DISK_CHECK_INTERVAL_MINUTES_KEY +
566+
" must be greater than zero and was set to {}. Defaulting to {}",
571567
periodicDiskCheckIntervalMinutes,
572568
PERIODIC_DISK_CHECK_INTERVAL_MINUTES_DEFAULT);
573-
574-
periodicDiskCheckIntervalMinutes = PERIODIC_DISK_CHECK_INTERVAL_MINUTES_DEFAULT;
569+
periodicDiskCheckIntervalMinutes =
570+
PERIODIC_DISK_CHECK_INTERVAL_MINUTES_DEFAULT;
575571
}
576572

577573
if (failedDataVolumesTolerated < -1) {
578-
LOG.warn("{} must be greater than -1 and was set to {}. Defaulting to {}",
579-
FAILED_DATA_VOLUMES_TOLERATED_KEY,
580-
failedDataVolumesTolerated,
581-
FAILED_VOLUMES_TOLERATED_DEFAULT);
582-
574+
LOG.warn(FAILED_DATA_VOLUMES_TOLERATED_KEY +
575+
"must be greater than -1 and was set to {}. Defaulting to {}",
576+
failedDataVolumesTolerated, FAILED_VOLUMES_TOLERATED_DEFAULT);
583577
failedDataVolumesTolerated = FAILED_VOLUMES_TOLERATED_DEFAULT;
584578
}
585579

586580
if (failedMetadataVolumesTolerated < -1) {
587-
LOG.warn("{} must be greater than -1 and was set to {}. Defaulting to {}",
588-
FAILED_METADATA_VOLUMES_TOLERATED_KEY,
589-
failedMetadataVolumesTolerated,
590-
FAILED_VOLUMES_TOLERATED_DEFAULT);
591-
581+
LOG.warn(FAILED_METADATA_VOLUMES_TOLERATED_KEY +
582+
"must be greater than -1 and was set to {}. Defaulting to {}",
583+
failedMetadataVolumesTolerated, FAILED_VOLUMES_TOLERATED_DEFAULT);
592584
failedMetadataVolumesTolerated = FAILED_VOLUMES_TOLERATED_DEFAULT;
593585
}
594586

595587
if (failedDbVolumesTolerated < -1) {
596-
LOG.warn("{} must be greater than -1 and was set to {}. Defaulting to {}",
597-
FAILED_DB_VOLUMES_TOLERATED_KEY,
598-
failedDbVolumesTolerated,
599-
FAILED_VOLUMES_TOLERATED_DEFAULT);
600-
588+
LOG.warn(FAILED_DB_VOLUMES_TOLERATED_KEY +
589+
"must be greater than -1 and was set to {}. Defaulting to {}",
590+
failedDbVolumesTolerated, FAILED_VOLUMES_TOLERATED_DEFAULT);
601591
failedDbVolumesTolerated = FAILED_VOLUMES_TOLERATED_DEFAULT;
602592
}
603593

604594
if (volumeIOTestCount == 0) {
605595
LOG.info("{} set to {}. Disk IO health tests have been disabled.",
606-
DISK_CHECK_IO_TEST_COUNT_KEY,
607-
volumeIOTestCount);
596+
DISK_CHECK_IO_TEST_COUNT_KEY, volumeIOTestCount);
608597
} else {
609598
if (volumeIOTestCount < 0) {
610-
LOG.warn("{} must be greater than 0 but was set to {}. Defaulting to {}",
611-
DISK_CHECK_IO_TEST_COUNT_KEY,
612-
volumeIOTestCount,
599+
LOG.warn("{} must be greater than 0 but was set to {}." +
600+
"Defaulting to {}",
601+
DISK_CHECK_IO_TEST_COUNT_KEY, volumeIOTestCount,
613602
DISK_CHECK_IO_TEST_COUNT_DEFAULT);
614-
615603
volumeIOTestCount = DISK_CHECK_IO_TEST_COUNT_DEFAULT;
616604
}
617605

618606
if (volumeIOFailureTolerance < 0) {
619-
LOG.warn("{} must be greater than or equal to 0 but was set to {}. Defaulting to {}",
620-
DISK_CHECK_IO_FAILURES_TOLERATED_KEY,
621-
volumeIOFailureTolerance,
607+
LOG.warn("{} must be greater than or equal to 0 but was set to {}. " +
608+
"Defaulting to {}",
609+
DISK_CHECK_IO_FAILURES_TOLERATED_KEY, volumeIOFailureTolerance,
622610
DISK_CHECK_IO_FAILURES_TOLERATED_DEFAULT);
623-
624611
volumeIOFailureTolerance = DISK_CHECK_IO_FAILURES_TOLERATED_DEFAULT;
625612
}
626613

627614
if (volumeIOFailureTolerance >= volumeIOTestCount) {
628-
LOG.warn("{} was set to {} but cannot be greater or equals to {} set to {}. Defaulting {} to {} and {} to {}",
629-
DISK_CHECK_IO_FAILURES_TOLERATED_KEY,
630-
volumeIOFailureTolerance,
631-
DISK_CHECK_IO_TEST_COUNT_KEY,
632-
volumeIOTestCount,
615+
LOG.warn("{} was set to {} but cannot be greater or equals to {} " +
616+
"set to {}. Defaulting {} to {} and {} to {}",
617+
DISK_CHECK_IO_FAILURES_TOLERATED_KEY, volumeIOFailureTolerance,
618+
DISK_CHECK_IO_TEST_COUNT_KEY, volumeIOTestCount,
633619
DISK_CHECK_IO_FAILURES_TOLERATED_KEY,
634620
DISK_CHECK_IO_FAILURES_TOLERATED_DEFAULT,
635-
DISK_CHECK_IO_TEST_COUNT_KEY,
636-
DISK_CHECK_IO_TEST_COUNT_DEFAULT);
637-
621+
DISK_CHECK_IO_TEST_COUNT_KEY, DISK_CHECK_IO_TEST_COUNT_DEFAULT);
638622
volumeIOTestCount = DISK_CHECK_IO_TEST_COUNT_DEFAULT;
639623
volumeIOFailureTolerance = DISK_CHECK_IO_FAILURES_TOLERATED_DEFAULT;
640624
}
641625

642626
if (volumeHealthCheckFileSize < 1) {
643-
LOG.warn("{} must be at least 1 byte and was set to {}. Defaulting to {}",
644-
DISK_CHECK_FILE_SIZE_KEY,
627+
LOG.warn(DISK_CHECK_FILE_SIZE_KEY +
628+
"must be at least 1 byte and was set to {}. Defaulting to {}",
645629
volumeHealthCheckFileSize,
646630
DISK_CHECK_FILE_SIZE_DEFAULT);
647-
648-
volumeHealthCheckFileSize = DISK_CHECK_FILE_SIZE_DEFAULT;
631+
volumeHealthCheckFileSize =
632+
DISK_CHECK_FILE_SIZE_DEFAULT;
649633
}
650634
}
651635

652636
if (diskCheckMinGap.isNegative()) {
653-
LOG.warn("{} must be greater than zero and was set to {}. Defaulting to {}",
654-
DISK_CHECK_MIN_GAP_KEY,
655-
diskCheckMinGap,
656-
DISK_CHECK_MIN_GAP_DEFAULT);
657-
637+
LOG.warn(DISK_CHECK_MIN_GAP_KEY +
638+
" must be greater than zero and was set to {}. Defaulting to {}",
639+
diskCheckMinGap, DISK_CHECK_MIN_GAP_DEFAULT);
658640
diskCheckMinGap = DISK_CHECK_MIN_GAP_DEFAULT;
659641
}
660642

661643
if (diskCheckTimeout.isNegative()) {
662-
LOG.warn("{} must be greater than zero and was set to {}. Defaulting to {}",
663-
DISK_CHECK_TIMEOUT_KEY,
664-
diskCheckTimeout,
665-
DISK_CHECK_TIMEOUT_DEFAULT);
666-
644+
LOG.warn(DISK_CHECK_TIMEOUT_KEY +
645+
" must be greater than zero and was set to {}. Defaulting to {}",
646+
diskCheckTimeout, DISK_CHECK_TIMEOUT_DEFAULT);
667647
diskCheckTimeout = DISK_CHECK_TIMEOUT_DEFAULT;
668648
}
669649

670650
if (blockDeleteCommandWorkerInterval.isNegative()) {
671-
LOG.warn("{} must be greater than zero and was set to {}. Defaulting to {}",
672-
BLOCK_DELETE_COMMAND_WORKER_INTERVAL,
651+
LOG.warn(BLOCK_DELETE_COMMAND_WORKER_INTERVAL +
652+
" must be greater than zero and was set to {}. Defaulting to {}",
673653
blockDeleteCommandWorkerInterval,
674654
BLOCK_DELETE_COMMAND_WORKER_INTERVAL_DEFAULT);
675-
676-
blockDeleteCommandWorkerInterval = BLOCK_DELETE_COMMAND_WORKER_INTERVAL_DEFAULT;
655+
blockDeleteCommandWorkerInterval =
656+
BLOCK_DELETE_COMMAND_WORKER_INTERVAL_DEFAULT;
677657
}
678658

679659
if (rocksdbLogMaxFileSize < 0) {
680-
LOG.warn("{} must be no less than zero and was set to {}. Defaulting to {}",
681-
ROCKSDB_LOG_MAX_FILE_SIZE_BYTES_KEY,
682-
rocksdbLogMaxFileSize,
683-
ROCKSDB_LOG_MAX_FILE_SIZE_BYTES_DEFAULT);
684-
660+
LOG.warn(ROCKSDB_LOG_MAX_FILE_SIZE_BYTES_KEY +
661+
" must be no less than zero and was set to {}. Defaulting to {}",
662+
rocksdbLogMaxFileSize, ROCKSDB_LOG_MAX_FILE_SIZE_BYTES_DEFAULT);
685663
rocksdbLogMaxFileSize = ROCKSDB_LOG_MAX_FILE_SIZE_BYTES_DEFAULT;
686664
}
687665

688666
if (rocksdbLogMaxFileNum <= 0) {
689-
LOG.warn("{} must be greater than zero and was set to {}. Defaulting to {}",
690-
ROCKSDB_LOG_MAX_FILE_NUM_KEY,
691-
rocksdbLogMaxFileNum,
692-
ROCKSDB_LOG_MAX_FILE_NUM_DEFAULT);
693-
667+
LOG.warn(ROCKSDB_LOG_MAX_FILE_NUM_KEY +
668+
" must be greater than zero and was set to {}. Defaulting to {}",
669+
rocksdbLogMaxFileNum, ROCKSDB_LOG_MAX_FILE_NUM_DEFAULT);
694670
rocksdbLogMaxFileNum = ROCKSDB_LOG_MAX_FILE_NUM_DEFAULT;
695671
}
696672

697673
if (rocksdbDeleteObsoleteFilesPeriod <= 0) {
698-
LOG.warn("{} must be greater than zero and was set to {}. Defaulting to {}",
699-
ROCKSDB_DELETE_OBSOLETE_FILES_PERIOD_MICRO_SECONDS_KEY,
674+
LOG.warn(ROCKSDB_DELETE_OBSOLETE_FILES_PERIOD_MICRO_SECONDS_KEY +
675+
" must be greater than zero and was set to {}. Defaulting to {}",
700676
rocksdbDeleteObsoleteFilesPeriod,
701677
ROCKSDB_DELETE_OBSOLETE_FILES_PERIOD_MICRO_SECONDS_DEFAULT);
702-
703-
rocksdbDeleteObsoleteFilesPeriod = ROCKSDB_DELETE_OBSOLETE_FILES_PERIOD_MICRO_SECONDS_DEFAULT;
678+
rocksdbDeleteObsoleteFilesPeriod =
679+
ROCKSDB_DELETE_OBSOLETE_FILES_PERIOD_MICRO_SECONDS_DEFAULT;
704680
}
705681

706682
validateMinFreeSpace();

0 commit comments

Comments
 (0)