summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-10-12 23:32:20 +0200
committerHarald Musum <musum@verizonmedia.com>2020-10-12 23:32:20 +0200
commitb5ae081cbf848fe7794f9ddebdd1790f20943e67 (patch)
tree617ab810245d5bd0f3ab8ef03f67bbd0a62cdd72 /configserver
parentd9e5653651b02b993cc59c4bc1fc27ba5b139888 (diff)
Rename methods
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java2
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java2
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java6
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java2
4 files changed, 6 insertions, 6 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index cfccd0f7e16..e4d80f09b4b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -813,7 +813,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
public long createSession(ApplicationId applicationId, TimeoutBudget timeoutBudget, File applicationDirectory) {
SessionRepository sessionRepository = getTenant(applicationId).getSessionRepository();
- LocalSession session = sessionRepository.createSession(applicationDirectory, applicationId, timeoutBudget);
+ LocalSession session = sessionRepository.createSessionFromApplicationPackage(applicationDirectory, applicationId, timeoutBudget);
sessionRepository.addLocalSession(session);
return session.getSessionId();
}
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
index 43211d02a79..31f8f28531d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
@@ -87,7 +87,7 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
Tenant tenant = applicationRepository.getTenant(applicationId);
SessionRepository sessionRepository = tenant.getSessionRepository();
if (sessionRepository.getLocalSession(sessionId) == null)
- sessionRepository.createLocalSessionUsingDistributedApplicationPackage(sessionId);
+ sessionRepository.createLocalSessionFromDistributedApplicationPackage(sessionId);
}
}
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index a714558afe4..65de3af42ba 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -219,7 +219,7 @@ public class SessionRepository {
* @param timeoutBudget Timeout for creating session and waiting for other servers.
* @return a new session
*/
- public LocalSession createSession(File applicationDirectory, ApplicationId applicationId, TimeoutBudget timeoutBudget) {
+ public LocalSession createSessionFromApplicationPackage(File applicationDirectory, ApplicationId applicationId, TimeoutBudget timeoutBudget) {
applicationRepo.createApplication(applicationId);
Optional<Long> activeSessionId = applicationRepo.activeSessionOf(applicationId);
return create(applicationDirectory, applicationId, activeSessionId, false, timeoutBudget);
@@ -336,7 +336,7 @@ public class SessionRepository {
log.log(Level.FINE, () -> session.logPre() + "Confirming upload for session " + sessionId);
confirmUpload(session);
}
- createLocalSessionUsingDistributedApplicationPackage(sessionId);
+ createLocalSessionFromDistributedApplicationPackage(sessionId);
}
void activate(RemoteSession session) {
@@ -622,7 +622,7 @@ public class SessionRepository {
* Returns a new local session for the given session id if it does not already exist.
* Will also add the session to the local session cache if necessary
*/
- public void createLocalSessionUsingDistributedApplicationPackage(long sessionId) {
+ public void createLocalSessionFromDistributedApplicationPackage(long sessionId) {
if (applicationRepo.sessionExistsInFileSystem(sessionId)) {
log.log(Level.FINE, () -> "Local session for session id " + sessionId + " already exists");
createSessionFromId(sessionId);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
index bd5dd01a645..0f433f53c77 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
@@ -66,7 +66,7 @@ public class SessionStateWatcher {
}
private void createLocalSession(long sessionId) {
- sessionRepository.createLocalSessionUsingDistributedApplicationPackage(sessionId);
+ sessionRepository.createLocalSessionFromDistributedApplicationPackage(sessionId);
}
public long getSessionId() {