Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed error code to not re-use an old one (#9686)

This commit is contained in:
Tobias Gödderz 2019-08-13 15:18:45 +02:00 committed by Michael Hackstein
parent 8f050fc5d4
commit 6b3e11dd40
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/common/bootstrap/errors.js
View File

@ -131,7 +131,7 @@
"ERROR_REPLICATION_START_TICK_NOT_PRESENT" : { "code" : 1414, "message" : "start tick not present" },
"ERROR_REPLICATION_WRONG_CHECKSUM" : { "code" : 1416, "message" : "wrong checksum" },
"ERROR_REPLICATION_SHARD_NONEMPTY" : { "code" : 1417, "message" : "shard not empty" },
"ERROR_CLUSTER_SERVER_UNKNOWN" : { "code" : 1452, "message" : "got a request from an unkown server" },
"ERROR_CLUSTER_SERVER_UNKNOWN" : { "code" : 1449, "message" : "got a request from an unkown server" },
"ERROR_CLUSTER_COLLECTION_ID_EXISTS" : { "code" : 1453, "message" : "collection ID already exists" },
"ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION_IN_PLAN" : { "code" : 1454, "message" : "could not create collection in plan" },
"ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION" : { "code" : 1456, "message" : "could not create collection" },

2
lib/Basics/errors.dat
View File

@ -169,7 +169,7 @@ ERROR_REPLICATION_SHARD_NONEMPTY,1417,"shard not empty","Will be raised when a s
## ArangoDB cluster errors
################################################################################
ERROR_CLUSTER_SERVER_UNKNOWN,1452,"got a request from an unkown server","Will be raised on some occasions when one server gets a request from another, which has not (yet?) been made known via the agency."
ERROR_CLUSTER_SERVER_UNKNOWN,1449,"got a request from an unkown server","Will be raised on some occasions when one server gets a request from another, which has not (yet?) been made known via the agency."
ERROR_CLUSTER_COLLECTION_ID_EXISTS,1453,"collection ID already exists","Will be raised when a coordinator in a cluster tries to create a collection and the collection ID already exists."
ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION_IN_PLAN,1454,"could not create collection in plan","Will be raised when a coordinator in a cluster cannot create an entry for a new collection in the Plan hierarchy in the agency."
ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION,1456,"could not create collection","Will be raised when a coordinator in a cluster notices that some DBServers report problems when creating shards for a new collection."

2
lib/Basics/voc-errors.cpp
View File

@ -1,8 +1,8 @@
/// auto-generated file generated from errors.dat
#include "Basics/voc-errors.h"
#include "Basics/Common.h"
#include "Basics/error.h"
#include "Basics/voc-errors.h"
/// helper macro to define an error string
#define REG_ERROR(id, label) TRI_set_errno_string(TRI_ ## id, label);

4
lib/Basics/voc-errors.h
View File

@ -658,11 +658,11 @@ constexpr int TRI_ERROR_REPLICATION_WRONG_CHECKSUM
/// Will be raised when a shard is not empty and the follower tries a shortcut
constexpr int TRI_ERROR_REPLICATION_SHARD_NONEMPTY = 1417;
/// 1452: ERROR_CLUSTER_SERVER_UNKNOWN
/// 1449: ERROR_CLUSTER_SERVER_UNKNOWN
/// "got a request from an unkown server"
/// Will be raised on some occasions when one server gets a request from
/// another, which has not (yet?) been made known via the agency.
constexpr int TRI_ERROR_CLUSTER_SERVER_UNKNOWN = 1452;
constexpr int TRI_ERROR_CLUSTER_SERVER_UNKNOWN = 1449;
/// 1453: ERROR_CLUSTER_COLLECTION_ID_EXISTS
/// "collection ID already exists"