honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade API should work with TRIAL license as well (elastic/x-pack-elasticsearch#1567) 

Relates to elastic/x-pack-elasticsearch#1214

Original commit: elastic/x-pack-elasticsearch@2ad7e389fb
This commit is contained in:
Igor Motov 2017-05-30 16:08:21 -04:00
parent 568802bbcd
commit b564e6e102
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugin/src/main/java/org/elasticsearch/license/XPackLicenseState.java
View File

@ -464,7 +464,7 @@ public class XPackLicenseState {
/**
* Determine if Upgrade API should be enabled.
* <p>
* Upgrade API is not available in for all license types except {@link OperationMode#TRIAL}
* Upgrade API is not available in for all license types except {@link OperationMode#MISSING}
*
* @return {@code true} as long as the license is valid. Otherwise
* {@code false}.
@ -472,13 +472,7 @@ public class XPackLicenseState {
public boolean isUpgradeAllowed() {
// status is volatile
Status localStatus = status;
OperationMode operationMode = localStatus.mode;
boolean licensed = operationMode == OperationMode.BASIC || operationMode == OperationMode.STANDARD ||
operationMode == OperationMode.GOLD || operationMode == OperationMode.PLATINUM;
return licensed && localStatus.active;
// Should work on all active licenses
return localStatus.active;
}
}

2
plugin/src/main/java/org/elasticsearch/xpack/upgrade/Upgrade.java
View File

@ -46,7 +46,7 @@ import java.util.function.Supplier;
public class Upgrade implements ActionPlugin {
public static final Version UPGRADE_INTRODUCED = Version.V_5_5_0_UNRELEASED; // TODO: Probably will need to change this to 5.6.0
public static final Version UPGRADE_INTRODUCED = Version.V_5_5_0; // TODO: Probably will need to change this to 5.6.0
private final Settings settings;
private final List<BiFunction<InternalClient, ClusterService, IndexUpgradeCheck>> upgradeCheckFactories;

4
plugin/src/test/java/org/elasticsearch/xpack/upgrade/IndexUpgradeIntegTestCase.java
View File

@ -60,11 +60,11 @@ public abstract class IndexUpgradeIntegTestCase extends AbstractLicensesIntegrat
return nodePlugins();
}
private static String randomValidLicenseType() {
return randomFrom("platinum", "gold", "standard", "basic");
return randomFrom("trial", "platinum", "gold", "standard", "basic");
}
private static String randomInvalidLicenseType() {
return randomFrom("missing", "trial");
return "missing";
}
public void disableLicensing() throws Exception {