Commit 8a5c2822 authored by Cedric Caffy's avatar Cedric Caffy
Browse files

Increase the minRequestAge in the...

Increase the minRequestAge in the getNextMountWithArchiveForUserAndArchiveForRepackShouldReturnBothMountsArchiveMinRequestAge test
parent b614e812
...@@ -5106,7 +5106,7 @@ TEST_P(SchedulerTest, retrieveArchiveAllTypesMaxDrivesVoInFlightChangeScheduleMo ...@@ -5106,7 +5106,7 @@ TEST_P(SchedulerTest, retrieveArchiveAllTypesMaxDrivesVoInFlightChangeScheduleMo
catalogue.modifyMountPolicyRetrieveMinRequestAge(s_adminOnAdminHost,s_mountPolicyName,0); catalogue.modifyMountPolicyRetrieveMinRequestAge(s_adminOnAdminHost,s_mountPolicyName,0);
//Wait 2 second to be sure the minRequestAge will not prevent a mount //Wait 2 second to be sure the minRequestAge will not prevent a mount
::sleep(2); ::sleep(1);
ASSERT_TRUE(scheduler.getNextMountDryRun(s_libraryName,drive1,lc)); ASSERT_TRUE(scheduler.getNextMountDryRun(s_libraryName,drive1,lc));
...@@ -5353,7 +5353,6 @@ TEST_P(SchedulerTest, getNextMountWithArchiveForUserAndArchiveForRepackShouldRet ...@@ -5353,7 +5353,6 @@ TEST_P(SchedulerTest, getNextMountWithArchiveForUserAndArchiveForRepackShouldRet
auto &schedulerDB = getSchedulerDB(); auto &schedulerDB = getSchedulerDB();
cta::objectstore::Backend& backend = schedulerDB.getBackend(); cta::objectstore::Backend& backend = schedulerDB.getBackend();
setupDefaultCatalogue(); setupDefaultCatalogue();
#define STDOUT_LOGGING
#ifdef STDOUT_LOGGING #ifdef STDOUT_LOGGING
log::StdoutLogger dl("dummy", "unitTest"); log::StdoutLogger dl("dummy", "unitTest");
#else #else
...@@ -5425,7 +5424,7 @@ TEST_P(SchedulerTest, getNextMountWithArchiveForUserAndArchiveForRepackShouldRet ...@@ -5425,7 +5424,7 @@ TEST_P(SchedulerTest, getNextMountWithArchiveForUserAndArchiveForRepackShouldRet
ar->insert(); ar->insert();
} }
catalogue.modifyMountPolicyArchiveMinRequestAge(s_adminOnAdminHost,s_mountPolicyName,10); catalogue.modifyMountPolicyArchiveMinRequestAge(s_adminOnAdminHost,s_mountPolicyName,100);
sorter.flushAll(lc); sorter.flushAll(lc);
...@@ -5433,8 +5432,8 @@ TEST_P(SchedulerTest, getNextMountWithArchiveForUserAndArchiveForRepackShouldRet ...@@ -5433,8 +5432,8 @@ TEST_P(SchedulerTest, getNextMountWithArchiveForUserAndArchiveForRepackShouldRet
catalogue.modifyMountPolicyArchiveMinRequestAge(s_adminOnAdminHost,s_mountPolicyName,0); catalogue.modifyMountPolicyArchiveMinRequestAge(s_adminOnAdminHost,s_mountPolicyName,0);
//The archiveMinRequestAge should have 2 second to trigger a mount //The archiveMinRequestAge should have 1 second to trigger a mount
::sleep(2); ::sleep(1);
ASSERT_TRUE(scheduler.getNextMountDryRun(s_libraryName,drive0,lc)); ASSERT_TRUE(scheduler.getNextMountDryRun(s_libraryName,drive0,lc));
...@@ -5485,14 +5484,14 @@ TEST_P(SchedulerTest, getNextMountWithArchiveForUserAndArchiveForRepackShouldRet ...@@ -5485,14 +5484,14 @@ TEST_P(SchedulerTest, getNextMountWithArchiveForUserAndArchiveForRepackShouldRet
sorter.flushAll(lc); sorter.flushAll(lc);
catalogue.modifyMountPolicyArchiveMinRequestAge(s_adminOnAdminHost,s_mountPolicyName,10); catalogue.modifyMountPolicyArchiveMinRequestAge(s_adminOnAdminHost,s_mountPolicyName,100);
//mount should not be triggered //mount should not be triggered
ASSERT_FALSE(scheduler.getNextMountDryRun(s_libraryName,drive0,lc)); ASSERT_FALSE(scheduler.getNextMountDryRun(s_libraryName,drive0,lc));
catalogue.modifyMountPolicyArchiveMinRequestAge(s_adminOnAdminHost,s_mountPolicyName,0); catalogue.modifyMountPolicyArchiveMinRequestAge(s_adminOnAdminHost,s_mountPolicyName,0);
//Sleeping two seconds to trigger a mount //Sleeping one seconds to trigger a mount
::sleep(2); ::sleep(1);
catalogue.modifyVirtualOrganizationWriteMaxDrives(s_adminOnAdminHost,s_vo,1); catalogue.modifyVirtualOrganizationWriteMaxDrives(s_adminOnAdminHost,s_vo,1);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment