Merge branch 'main' into rw/removefeatureflag-1

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

Author: vinaykpud

CHANGELOG.md

@@ -42,6 +42,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Unwrap singleton DocValues in date histogram aggregation. ([#17643](https://github.com/opensearch-project/OpenSearch/pull/17643))
 - Introduce 512 byte limit to search and ingest pipeline IDs ([#17786](https://github.com/opensearch-project/OpenSearch/pull/17786))
 - Avoid skewed segment replication lag metric ([#17831](https://github.com/opensearch-project/OpenSearch/pull/17831))
+- Increase the default segment counter step size when replica promoting ([#17568](https://github.com/opensearch-project/OpenSearch/pull/17568))
 
 ### Dependencies
 - Bump `com.nimbusds:nimbus-jose-jwt` from 9.41.1 to 10.0.2 ([#17607](https://github.com/opensearch-project/OpenSearch/pull/17607), [#17669](https://github.com/opensearch-project/OpenSearch/pull/17669))

gradle/ide.gradle

@@ -49,6 +49,10 @@ if (System.getProperty('idea.active') == 'true') {
     }
   }
 
+  buildScan {
+    server = 'https://127.0.0.1'
+  }
+
   idea {
     project {
       vcs = 'Git'
@@ -81,8 +85,14 @@ if (System.getProperty('idea.active') == 'true') {
         }
         runConfigurations {
           defaults(JUnit) {
-            vmParameters = '-ea -Djava.locale.providers=SPI,CLDR'
-            vmParameters += ' -javaagent:' + project(':libs:agent-sm:agent').jar.archiveFile.get()
+            project(':libs:agent-sm:agent').afterEvaluate { agentProject ->
+              vmParameters = '-ea -Djava.locale.providers=SPI,CLDR'
+              def jarName = "${agentProject.base.archivesName.get()}-${project.version}.jar"
+              vmParameters += ' -javaagent:' + agentProject.layout.buildDirectory
+                .dir('distributions')
+                .map { it.file(jarName) }
+                .get()
+            }
           }
         }
         copyright {

modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy

@@ -36,6 +36,7 @@ grant {
 
    // netty makes and accepts socket connections
    permission java.net.SocketPermission "*", "accept,connect";
+   permission java.net.NetPermission "accessUnixDomainSocket";
 
    // Netty sets custom classloader for some of its internal threads
    permission java.lang.RuntimePermission "*", "setContextClassLoader";

plugins/transport-reactor-netty4/src/main/plugin-metadata/plugin-security.policy

@@ -12,6 +12,7 @@ grant {
 
    // netty makes and accepts socket connections
    permission java.net.SocketPermission "*", "accept,connect";
+   permission java.net.NetPermission "accessUnixDomainSocket";
 
    // Netty sets custom classloader for some of its internal threads
    permission java.lang.RuntimePermission "*", "setContextClassLoader";

server/src/main/java/org/opensearch/index/engine/NRTReplicationEngine.java

@@ -67,7 +67,7 @@ public class NRTReplicationEngine extends Engine {
 
     private volatile long lastReceivedPrimaryGen = SequenceNumbers.NO_OPS_PERFORMED;
 
-    private static final int SI_COUNTER_INCREMENT = 10;
+    private static final int SI_COUNTER_INCREMENT = 100000;
 
     public NRTReplicationEngine(EngineConfig engineConfig) {
         super(engineConfig);

server/src/main/java/org/opensearch/index/mapper/MappedFieldType.java

@@ -101,7 +101,7 @@ public MappedFieldType(
         TextSearchInfo textSearchInfo,
         Map<String, String> meta
     ) {
-        setBoost(1.0f);
+        this.boost = 1.0f;
         this.name = Objects.requireNonNull(name);
         this.isIndexed = isIndexed;
         this.isStored = isStored;

server/src/main/java/org/opensearch/index/mapper/ParametrizedFieldMapper.java

@@ -95,7 +95,7 @@ protected ParametrizedFieldMapper(String simpleName, MappedFieldType mappedField
     public abstract ParametrizedFieldMapper.Builder getMergeBuilder();
 
     @Override
-    public final ParametrizedFieldMapper merge(Mapper mergeWith) {
+    public ParametrizedFieldMapper merge(Mapper mergeWith) {
 
         if (mergeWith instanceof FieldMapper == false) {
             throw new IllegalArgumentException(
@@ -348,7 +348,7 @@ private void merge(FieldMapper toMerge, Conflicts conflicts) {
             }
         }
 
-        protected void toXContent(XContentBuilder builder, boolean includeDefaults) throws IOException {
+        public void toXContent(XContentBuilder builder, boolean includeDefaults) throws IOException {
             if (serializerCheck.check(includeDefaults, isConfigured(), get())) {
                 serializer.serialize(builder, name, getValue());
             }
@@ -649,7 +649,7 @@ protected String buildFullName(BuilderContext context) {
         /**
          * Writes the current builder parameter values as XContent
          */
-        protected final void toXContent(XContentBuilder builder, boolean includeDefaults) throws IOException {
+        public final void toXContent(XContentBuilder builder, boolean includeDefaults) throws IOException {
             for (Parameter<?> parameter : getParameters()) {
                 parameter.toXContent(builder, includeDefaults);
             }