Skip to content
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

PAYARA-3821 Add asadmin command to reset AMX metrics #4020

Merged
merged 30 commits into from Jun 10, 2019
Merged
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
41cf6d9
Merge pull request #4 from payara/master
AlanRoth Apr 29, 2019
50ff38f
Merge pull request #5 from payara/master
AlanRoth May 10, 2019
6b4735c
Merge pull request #6 from payara/master
AlanRoth May 13, 2019
34a37ec
Merge pull request #7 from payara/master
AlanRoth May 29, 2019
aa9cd57
Merge pull request #8 from payara/master
AlanRoth Jun 4, 2019
61bb929
Created new command
AlanRoth Jun 6, 2019
08cfcb4
Added new asadmin command; reset-monitoring-levels
AlanRoth Jun 7, 2019
9330cac
Moved formatting to seprate method
AlanRoth Jun 7, 2019
3b8e3d7
formatting
AlanRoth Jun 7, 2019
187db8b
more formatting
AlanRoth Jun 7, 2019
e78975f
Added long name to verbose
AlanRoth Jun 7, 2019
11aa840
Removed unnecessary pom.xml change
AlanRoth Jun 7, 2019
7656b41
'set' in error to 'reset' and license header
AlanRoth Jun 7, 2019
0fecf7a
Carry on execution, failure -> warning
AlanRoth Jun 7, 2019
9f73b5f
Added reset completed with warnings message
AlanRoth Jun 7, 2019
5767242
Renaming, formatting, commenting
AlanRoth Jun 7, 2019
1839403
Update date in license
AlanRoth Jun 7, 2019
a64cc88
cluser -> deploymentgroup
AlanRoth Jun 7, 2019
ffd73e6
boolean -> Boolean caused NPE
AlanRoth Jun 7, 2019
0137cd3
License header date
AlanRoth Jun 7, 2019
6cee580
Merge branch 'PAYARA-3821' of https://github.com/AlanRoth/Payara into…
AlanRoth Jun 7, 2019
a3c0ec3
reset -> restarted in message
AlanRoth Jun 7, 2019
35337bc
set -> restart
AlanRoth Jun 7, 2019
6c686ec
Expanded description a little
AlanRoth Jun 7, 2019
e6ae27f
Changed class name
AlanRoth Jun 7, 2019
48346b8
Don't turn off already off modules
AlanRoth Jun 7, 2019
b55917e
Reset -> restarted in warning message
AlanRoth Jun 7, 2019
72c6de9
Removed uneeded comments
AlanRoth Jun 7, 2019
5031ddd
Reused method, added clarifying comment
AlanRoth Jun 10, 2019
08c7996
reset-monitoring -> restart-monitoring in warning
AlanRoth Jun 10, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -0,0 +1,177 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright (c) 2019 Payara Foundation and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
* and Distribution License("CDDL") (collectively, the "License"). You
* may not use this file except in compliance with the License. You can
* obtain a copy of the License at
* https://github.com/payara/Payara/blob/master/LICENSE.txt
* See the License for the specific
* language governing permissions and limitations under the License.
*
* When distributing the software, include this License Header Notice in each
* file and include the License file at glassfish/legal/LICENSE.txt.
*
* GPL Classpath Exception:
* The Payara Foundation designates this particular file as subject to the "Classpath"
* exception as provided by the Payara Foundation in the GPL Version 2 section of the License
* file that accompanied this code.
*
* Modifications:
* If applicable, add the following below the License Header, with the fields
* enclosed by brackets [] replaced by your own identifying information:
* "Portions Copyright [year] [name of copyright owner]"
*
* Contributor(s):
* If you wish your version of this file to be governed by only the CDDL or
* only the GPL Version 2, indicate your decision by adding "[Contributor]
* elects to include this software in this distribution under the [CDDL or GPL
* Version 2] license." If you don't indicate a single choice of license, a
* recipient has the option to distribute your version of this file under
* either the CDDL, the GPL Version 2 or to extend the choice of license to
* its licensees as provided above. However, if you add GPL Version 2 code
* and therefore, elected the GPL Version 2 license, then the option applies
* only if the new code is made subject to such option by the copyright
* holder.
*/
package fish.payara.admin.monitor.cli;

import com.sun.enterprise.config.serverbeans.Config;
import com.sun.enterprise.config.serverbeans.MonitoringService;
import com.sun.enterprise.util.ColumnFormatter;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.Param;
import org.glassfish.api.admin.AdminCommand;
import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.ExecuteOn;
import org.glassfish.api.admin.RuntimeType;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.internal.api.Target;
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.TransactionFailure;

/**
* Asadmin command to restart Module Monitoring Level.
* Sets monitoring module levels to OFF before reverting back to their previous values.
*
* This was Feature request due to AMX metrics "breaking" sometimes, where restarting it manually was somewhat tedious and prone to error.
*
* @author Alan Roth
*/
@Service(name = "restart-monitoring")
@PerLookup
@ExecuteOn({RuntimeType.DAS, RuntimeType.INSTANCE})
@TargetType({CommandTarget.DAS, CommandTarget.STANDALONE_INSTANCE, CommandTarget.DEPLOYMENT_GROUP, CommandTarget.CONFIG})
public class RestartMonitoring implements AdminCommand {

@Param(name = "target", optional = true, defaultValue = "server-config")
String target;

@Param(name = "verbose", optional = true, shortName = "v", defaultValue = "false")
private Boolean verbose;

@Inject
private Target targetUtil;

@Inject
private Logger logger;

private MonitoringService monitoringService;

private ActionReport actionReport;

@Override
public void execute(AdminCommandContext context) {
actionReport = context.getActionReport();

List<String> validModuleList = Arrays.asList(Constants.validModuleNames);
Config config = targetUtil.getConfig(target);
if (config != null) {
monitoringService = config.getMonitoringService();
} else {
actionReport.setMessage("Cound not find target: " + target);
actionReport.setActionExitCode(ActionReport.ExitCode.FAILURE);
return;
}

Map<String, String> enabledModules = getEnabledModules(validModuleList);
Map<String, String> disabledModules = new HashMap<>();

for(String key : enabledModules.keySet()){
disabledModules.put(key, "OFF");
}

setModules(disabledModules);
setModules(enabledModules);

if(actionReport.getActionExitCode().equals(actionReport.getActionExitCode().WARNING)){
actionReport.appendMessage("Restarted monitoring levels with warnings");
}

if (verbose) {
actionReport.setMessage(getFormattedColumns(enabledModules).toString());
} else {
actionReport.setMessage("Restarted " + enabledModules.size() + " modules");
}
}

/*
*The config is directly changed, using a supporting class (See ConfigSupport) which uses a transaction
*to change the value of the monitoring modules config. The changes take affect immedietly after a succesful transaction.
*/
private void setModules(Map<String, String> modules){
for (String module : modules.keySet()) {
String moduleLevel = modules.get(module);
try {
ConfigSupport.apply((final MonitoringService monitoringServiceProxy) -> {
monitoringServiceProxy.setMonitoringLevel(module, moduleLevel);
return monitoringServiceProxy;
}, monitoringService);
} catch (TransactionFailure ex) {
logger.log(Level.WARNING, "Failed to execute the command restart-monitoring, while changing the module level: {0}", ex.getCause().getMessage());
actionReport.setMessage(ex.getCause().getMessage());
actionReport.setActionExitCode(ActionReport.ExitCode.WARNING);
}
}
}

private Map<String, String> getEnabledModules(List<String> validModules) {
Map<String, String> enabledModules = new HashMap<>();
for (String module : validModules) {
String level = monitoringService.getMonitoringLevel(module);
if (!"OFF".equals(level)) {
enabledModules.put(module, level);
}
}
return enabledModules;
}

private ColumnFormatter getFormattedColumns(Map<String, String> enabledModules) {
final String[] headers = {"Module", "Monitoring Level"};
ColumnFormatter columnFormatter = new ColumnFormatter(headers);
Map<String, Object> extraPropertiesMap = new HashMap<>();

if (!enabledModules.isEmpty()) {
for (String module : enabledModules.keySet()) {
columnFormatter.addRow(new Object[]{module,
monitoringService.getMonitoringLevel(module)});
extraPropertiesMap.put(module,
monitoringService.getMonitoringLevel(module));
}
}
return columnFormatter;
}
}