add back index and delete engine failure exceptions as deprecated for bwc with 5.x
This commit is contained in:
parent
cf3e2d1aa8
commit
ee0b2733d1
|
@ -486,7 +486,8 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
|
||||||
org.elasticsearch.index.shard.TranslogRecoveryPerformer.BatchOperationException::new, 26),
|
org.elasticsearch.index.shard.TranslogRecoveryPerformer.BatchOperationException::new, 26),
|
||||||
SNAPSHOT_CREATION_EXCEPTION(org.elasticsearch.snapshots.SnapshotCreationException.class,
|
SNAPSHOT_CREATION_EXCEPTION(org.elasticsearch.snapshots.SnapshotCreationException.class,
|
||||||
org.elasticsearch.snapshots.SnapshotCreationException::new, 27),
|
org.elasticsearch.snapshots.SnapshotCreationException::new, 27),
|
||||||
// 28 was DeleteFailedEngineException
|
DELETE_FAILED_ENGINE_EXCEPTION(org.elasticsearch.index.engine.DeleteFailedEngineException.class,
|
||||||
|
org.elasticsearch.index.engine.DeleteFailedEngineException::new, 28),// deprecated in 6.0, remove in 7.0
|
||||||
DOCUMENT_MISSING_EXCEPTION(org.elasticsearch.index.engine.DocumentMissingException.class,
|
DOCUMENT_MISSING_EXCEPTION(org.elasticsearch.index.engine.DocumentMissingException.class,
|
||||||
org.elasticsearch.index.engine.DocumentMissingException::new, 29),
|
org.elasticsearch.index.engine.DocumentMissingException::new, 29),
|
||||||
SNAPSHOT_EXCEPTION(org.elasticsearch.snapshots.SnapshotException.class,
|
SNAPSHOT_EXCEPTION(org.elasticsearch.snapshots.SnapshotException.class,
|
||||||
|
@ -579,7 +580,8 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
|
||||||
org.elasticsearch.action.TimestampParsingException::new, 78),
|
org.elasticsearch.action.TimestampParsingException::new, 78),
|
||||||
ROUTING_MISSING_EXCEPTION(org.elasticsearch.action.RoutingMissingException.class,
|
ROUTING_MISSING_EXCEPTION(org.elasticsearch.action.RoutingMissingException.class,
|
||||||
org.elasticsearch.action.RoutingMissingException::new, 79),
|
org.elasticsearch.action.RoutingMissingException::new, 79),
|
||||||
// 80 used to be for IndexFailedEngineException, removed in 6.0
|
INDEX_FAILED_ENGINE_EXCEPTION(org.elasticsearch.index.engine.IndexFailedEngineException.class,
|
||||||
|
org.elasticsearch.index.engine.IndexFailedEngineException::new, 80), // deprecated in 6.0, remove in 7.0
|
||||||
INDEX_SHARD_RESTORE_FAILED_EXCEPTION(org.elasticsearch.index.snapshots.IndexShardRestoreFailedException.class,
|
INDEX_SHARD_RESTORE_FAILED_EXCEPTION(org.elasticsearch.index.snapshots.IndexShardRestoreFailedException.class,
|
||||||
org.elasticsearch.index.snapshots.IndexShardRestoreFailedException::new, 81),
|
org.elasticsearch.index.snapshots.IndexShardRestoreFailedException::new, 81),
|
||||||
REPOSITORY_EXCEPTION(org.elasticsearch.repositories.RepositoryException.class,
|
REPOSITORY_EXCEPTION(org.elasticsearch.repositories.RepositoryException.class,
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
/*
|
||||||
|
* Licensed to Elasticsearch under one or more contributor
|
||||||
|
* license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright
|
||||||
|
* ownership. Elasticsearch 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.elasticsearch.index.engine;
|
||||||
|
|
||||||
|
import org.elasticsearch.common.io.stream.StreamInput;
|
||||||
|
import org.elasticsearch.index.shard.ShardId;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deprecated as not used in 6.0, should be removed in 7.0
|
||||||
|
* Still exists for bwc in serializing/deserializing from
|
||||||
|
* 5.x nodes
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
public class DeleteFailedEngineException extends EngineException {
|
||||||
|
public DeleteFailedEngineException(StreamInput in) throws IOException{
|
||||||
|
super(in);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,61 @@
|
||||||
|
/*
|
||||||
|
* Licensed to Elasticsearch under one or more contributor
|
||||||
|
* license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright
|
||||||
|
* ownership. Elasticsearch 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.elasticsearch.index.engine;
|
||||||
|
|
||||||
|
import org.elasticsearch.common.io.stream.StreamInput;
|
||||||
|
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||||
|
import org.elasticsearch.index.shard.ShardId;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deprecated as not used in 6.0, should be removed in 7.0
|
||||||
|
* Still exists for bwc in serializing/deserializing from
|
||||||
|
* 5.x nodes
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
public class IndexFailedEngineException extends EngineException {
|
||||||
|
|
||||||
|
private final String type;
|
||||||
|
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
public IndexFailedEngineException(StreamInput in) throws IOException{
|
||||||
|
super(in);
|
||||||
|
type = in.readString();
|
||||||
|
id = in.readString();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void writeTo(StreamOutput out) throws IOException {
|
||||||
|
super.writeTo(out);
|
||||||
|
out.writeString(type);
|
||||||
|
out.writeString(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String type() {
|
||||||
|
return this.type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String id() {
|
||||||
|
return this.id;
|
||||||
|
}
|
||||||
|
}
|
|
@ -664,7 +664,7 @@ public class ExceptionSerializationTests extends ESTestCase {
|
||||||
ids.put(25, org.elasticsearch.script.GeneralScriptException.class);
|
ids.put(25, org.elasticsearch.script.GeneralScriptException.class);
|
||||||
ids.put(26, org.elasticsearch.index.shard.TranslogRecoveryPerformer.BatchOperationException.class);
|
ids.put(26, org.elasticsearch.index.shard.TranslogRecoveryPerformer.BatchOperationException.class);
|
||||||
ids.put(27, org.elasticsearch.snapshots.SnapshotCreationException.class);
|
ids.put(27, org.elasticsearch.snapshots.SnapshotCreationException.class);
|
||||||
ids.put(28, null); // was DeleteFailedEngineException
|
ids.put(28, org.elasticsearch.index.engine.DeleteFailedEngineException.class); //deprecated in 6.0
|
||||||
ids.put(29, org.elasticsearch.index.engine.DocumentMissingException.class);
|
ids.put(29, org.elasticsearch.index.engine.DocumentMissingException.class);
|
||||||
ids.put(30, org.elasticsearch.snapshots.SnapshotException.class);
|
ids.put(30, org.elasticsearch.snapshots.SnapshotException.class);
|
||||||
ids.put(31, org.elasticsearch.indices.InvalidAliasNameException.class);
|
ids.put(31, org.elasticsearch.indices.InvalidAliasNameException.class);
|
||||||
|
@ -716,7 +716,7 @@ public class ExceptionSerializationTests extends ESTestCase {
|
||||||
ids.put(77, org.elasticsearch.common.util.concurrent.UncategorizedExecutionException.class);
|
ids.put(77, org.elasticsearch.common.util.concurrent.UncategorizedExecutionException.class);
|
||||||
ids.put(78, org.elasticsearch.action.TimestampParsingException.class);
|
ids.put(78, org.elasticsearch.action.TimestampParsingException.class);
|
||||||
ids.put(79, org.elasticsearch.action.RoutingMissingException.class);
|
ids.put(79, org.elasticsearch.action.RoutingMissingException.class);
|
||||||
ids.put(80, null); // was IndexFailedEngineException, removed in 6.0
|
ids.put(80, org.elasticsearch.index.engine.IndexFailedEngineException.class); //deprecated in 6.0
|
||||||
ids.put(81, org.elasticsearch.index.snapshots.IndexShardRestoreFailedException.class);
|
ids.put(81, org.elasticsearch.index.snapshots.IndexShardRestoreFailedException.class);
|
||||||
ids.put(82, org.elasticsearch.repositories.RepositoryException.class);
|
ids.put(82, org.elasticsearch.repositories.RepositoryException.class);
|
||||||
ids.put(83, org.elasticsearch.transport.ReceiveTimeoutTransportException.class);
|
ids.put(83, org.elasticsearch.transport.ReceiveTimeoutTransportException.class);
|
||||||
|
|
Loading…
Reference in New Issue