Java simulator: PUT/DELETE must set synchronozation to a valid value. If (d0cf2bd9) · Commits · kinetic-archive / kinetic-java

kinetic-simulator/src/main/java/com/seagate/kinetic/simulator/internal/handler/KeyValueOpHandler.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ public class KeyValueOpHandler extends CommandHandlerBase implements
		public void processRequest(KineticMessage request, KineticMessage response)
		throws ServiceException {

		KVOp.Op(engine.getAclMap(), engine.getStore(), request, response);
		KVOp.processRequest(engine.getAclMap(), engine.getStore(), request, response);
		}

		}

kinetic-simulator/src/main/java/com/seagate/kinetic/simulator/persist/KVOp.java

+36 −41

Original line number	Diff line number	Diff line
		@@ -68,26 +68,20 @@ public class KVOp {
		//max version size
		private static int maxVersionSize = SimulatorConfiguration.getMaxSupportedVersionSize();

		//max key range size
		//private static final int MAX_KEY_RANGE_SIZE = 1024;

		//max version size
		//private static int MAX_VERSION_SIZE = 2048;

		static void oops(String s) throws KvException {
		oops(Status.StatusCode.INTERNAL_ERROR, s);
		static void handleException(String s) throws KvException {
		handleException(Status.StatusCode.INTERNAL_ERROR, s);
		}

		static void oops(Status.StatusCode status, String s) throws KvException {
		static void handleException(Status.StatusCode status, String s) throws KvException {
		//LOG.warning("throwing exception., status code = " + status + ", msg = " +s);
		throw new KvException(status, s);
		}

		static void oops(Status.StatusCode status) throws KvException {
		static void handleException(Status.StatusCode status) throws KvException {
		throw new KvException(status, "");
		}

		public static void Op(Map<Long, ACL> aclmap,
		public static void processRequest(Map<Long, ACL> aclmap,
		Store<ByteString, ByteString, KVValue> store, KineticMessage kmreq,
		KineticMessage kmresp) {

		@@ -161,11 +155,11 @@ public class KVOp {
		break;
		case PUT:

		try {

		// persist option
		persistOption = getPersistOption(requestKeyValue);

		try {

		//check max key length
		checkMaxKeyLenth (key.size());

		@@ -220,9 +214,11 @@ public class KVOp {

		break;
		case DELETE:

		try {

		// persist option
		persistOption = getPersistOption(requestKeyValue);
		try {

		//check max key length
		checkMaxKeyLenth (key.size());
		@@ -336,22 +332,22 @@ public class KVOp {

		break;
		default:
		oops("Unknown request");
		handleException("Unknown request");
		}

		} catch (KVStoreNotFound e) {
		oops(Status.StatusCode.NOT_FOUND);
		handleException(Status.StatusCode.NOT_FOUND);
		} catch (KVStoreVersionMismatch e) {
		oops(Status.StatusCode.VERSION_MISMATCH);
		handleException(Status.StatusCode.VERSION_MISMATCH);
		} catch (KVStoreException e) {
		oops(Status.StatusCode.INTERNAL_ERROR,
		handleException(Status.StatusCode.INTERNAL_ERROR,
		"Opps1: " + e.getMessage());
		} catch (KVSecurityException e) {
		oops(StatusCode.NOT_AUTHORIZED, e.getMessage());
		handleException(StatusCode.NOT_AUTHORIZED, e.getMessage());
		} catch (InvalidRequestException e) {
		oops(StatusCode.INVALID_REQUEST, e.getMessage());
		handleException(StatusCode.INVALID_REQUEST, e.getMessage());
		} catch (Exception e) {
		oops(Status.StatusCode.INTERNAL_ERROR, e.getMessage());
		handleException(Status.StatusCode.INTERNAL_ERROR, e.getMessage());
		}

		// respond status
		@@ -401,13 +397,15 @@ public class KVOp {
		* @return persist option.
		* @throws KvException if invalid synchronization option is set in the kv parameter.
		*/
		public static PersistOption getPersistOption(KeyValue kv) throws KvException {
		public static PersistOption getPersistOption(KeyValue kv)
		throws InvalidRequestException {

		/**
		* if not set, default is set to sync/writethrough
		* synchronization must be set to a valid value.
		*/
		if (kv.hasSynchronization() == false) {
		return PersistOption.SYNC;
		throw new InvalidRequestException(
		"Persistent synchronization option must be set to a valid value");
		}

		PersistOption option = PersistOption.SYNC;
		@@ -417,7 +415,6 @@ public class KVOp {
		*/
		Synchronization sync = kv.getSynchronization();

		if (sync != null) {
		switch (sync) {
		case WRITETHROUGH:
		case FLUSH:
		@@ -427,9 +424,8 @@ public class KVOp {
		option = PersistOption.ASYNC;
		break;
		default:
		throw new KvException (Status.StatusCode.INVALID_REQUEST, "Invalid persistent synchronization option: " + sync);
		}

		throw new InvalidRequestException(
		"Invalid persistent synchronization option: " + sync);
		}

		return option;
		@@ -453,5 +449,4 @@ public class KVOp {
		}
		}


		}