-
Notifications
You must be signed in to change notification settings - Fork 642
HDDS-14356. Support OM Service Framework #10346
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ha/OMService.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.hadoop.ozone.om.ha; | ||
|
|
||
| /** | ||
| * Interface for stateful background service in OM. | ||
| * | ||
| * Provide a fine-grained method to manipulate the status of these background | ||
| * services. | ||
| */ | ||
| public interface OMService { | ||
| /** | ||
| * Notify raft or safe mode related status changed. | ||
| */ | ||
| void notifyStatusChanged(); | ||
|
|
||
| /** | ||
| * @return true, if next iteration of Service should take effect, | ||
| * false, if next iteration of Service should be skipped. | ||
| */ | ||
| boolean shouldRun(); | ||
|
|
||
| /** | ||
| * @return name of the Service. | ||
| */ | ||
| String getServiceName(); | ||
|
|
||
| /** | ||
| * Status of Service. | ||
| */ | ||
| enum ServiceStatus { | ||
| RUNNING, | ||
| PAUSING | ||
| } | ||
|
|
||
| /** | ||
| * starts the OM service. | ||
| */ | ||
| void start() throws OMServiceException; | ||
|
|
||
| /** | ||
| * stops the OM service. | ||
| */ | ||
| void stop(); | ||
|
|
||
| } |
40 changes: 40 additions & 0 deletions
40
...p-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ha/OMServiceException.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.hadoop.ozone.om.ha; | ||
|
|
||
| /** | ||
| * Checked exceptions thrown by an {@link OMService}. | ||
| */ | ||
| public class OMServiceException extends Exception { | ||
|
|
||
| public OMServiceException() { | ||
| super(); | ||
| } | ||
|
|
||
| public OMServiceException(String s) { | ||
| super(s); | ||
| } | ||
|
|
||
| public OMServiceException(String message, Throwable cause) { | ||
| super(message, cause); | ||
| } | ||
|
|
||
| public OMServiceException(Throwable cause) { | ||
| super(cause); | ||
| } | ||
| } |
77 changes: 77 additions & 0 deletions
77
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ha/OMServiceManager.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.hadoop.ozone.om.ha; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * Manipulate background services in OM. | ||
| */ | ||
| public final class OMServiceManager { | ||
| private static final Logger LOG = | ||
| LoggerFactory.getLogger(OMServiceManager.class); | ||
|
|
||
| private final List<OMService> services = new ArrayList<>(); | ||
|
|
||
| /** | ||
| * Register an OMService to OMServiceManager. | ||
| */ | ||
| public synchronized void register(OMService service) { | ||
| Objects.requireNonNull(service); | ||
| LOG.info("Registering service {}.", service.getServiceName()); | ||
| services.add(service); | ||
| } | ||
|
|
||
| /** | ||
| * Notify raft related status changed. | ||
| */ | ||
| public synchronized void notifyStatusChanged() { | ||
| for (OMService service : services) { | ||
| LOG.debug("Notify service:{}.", service.getServiceName()); | ||
| service.notifyStatusChanged(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Start all running services. | ||
| */ | ||
| public synchronized void start() { | ||
| for (OMService service : services) { | ||
| LOG.debug("Starting service:{}.", service.getServiceName()); | ||
| try { | ||
| service.start(); | ||
| } catch (OMServiceException e) { | ||
| LOG.warn("Could not start " + service.getServiceName(), e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Stops all running services. | ||
| */ | ||
| public synchronized void stop() { | ||
| for (OMService service : services) { | ||
| LOG.debug("Stopping service:{}.", service.getServiceName()); | ||
| service.stop(); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
...ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ha/TestOMServiceManager.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.hadoop.ozone.om.ha; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| /** | ||
| * Tests for {@link OMServiceManager}. | ||
| */ | ||
| public class TestOMServiceManager { | ||
|
|
||
| private static class OMContext { | ||
| private boolean isLeader; | ||
|
|
||
| OMContext() { | ||
| isLeader = false; | ||
| } | ||
|
|
||
| public boolean isLeader() { | ||
| return isLeader; | ||
| } | ||
|
|
||
| public void setLeader(boolean leader) { | ||
| this.isLeader = leader; | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testServiceRunWhenLeader() { | ||
|
|
||
| OMContext omContext = new OMContext(); | ||
|
|
||
| // A service runs when it is a leader. | ||
| OMService serviceRunWhenLeader = new OMService() { | ||
| private ServiceStatus serviceStatus = ServiceStatus.PAUSING; | ||
|
|
||
| @Override | ||
| public void notifyStatusChanged() { | ||
| if (omContext.isLeader()) { | ||
| serviceStatus = ServiceStatus.RUNNING; | ||
| } else { | ||
| serviceStatus = ServiceStatus.PAUSING; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean shouldRun() { | ||
| return serviceStatus == ServiceStatus.RUNNING; | ||
| } | ||
|
|
||
| @Override | ||
| public String getServiceName() { | ||
| return "serviceRunWhenLeader"; | ||
| } | ||
|
|
||
| @Override | ||
| public void start() throws OMServiceException { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void stop() { | ||
|
|
||
| } | ||
| }; | ||
|
|
||
| OMServiceManager serviceManager = new OMServiceManager(); | ||
| serviceManager.register(serviceRunWhenLeader); | ||
|
|
||
| // PAUSING at the beginning. | ||
| assertFalse(serviceRunWhenLeader.shouldRun()); | ||
|
|
||
| // RUNNING when becoming leader. | ||
| omContext.setLeader(true); | ||
| serviceManager.notifyStatusChanged(); | ||
| assertTrue(serviceRunWhenLeader.shouldRun()); | ||
|
|
||
| // PAUSING when stepping down. | ||
| omContext.setLeader(false); | ||
| serviceManager.notifyStatusChanged(); | ||
| assertFalse(serviceRunWhenLeader.shouldRun()); | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not an issue, but it's interesting to found that both ServiceManager.starts are implemented but never called.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we can make both ServiceManagers to call start if needed in the future. Currently, each SCMService#start is called manually.