Commit 06f0103a authored by chiaming2000's avatar chiaming2000
Browse files

Calculate a serial number for each simulator instance. This makes it 

possible to use the serial number to identify an instance of simulator
during and after restarted from a shutdown/crash.

A simulator instance serial number is calculated as follows (separated
by '-'.

SERIAL_PREFIX + ip + khomeHash + persistHome

where SERIAL_PREFIX is a constant,
ip is the ip of the simualtor,
khomeHash is the home (hash code) of the simulator instance,
persistHome is the persist home name of the instance set in the
SimulatorConfiguration.
parent 5928b5c8

kinetic-simulator/src/main/java/com/seagate/kinetic/simulator/internal/GetLogHandler.java

+3 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 */

package com.seagate.kinetic.simulator.internal;



import java.io.UnsupportedEncodingException;

import java.net.UnknownHostException;

import java.util.Arrays;

import java.util.List;
@@ -29,7 +30,6 @@ import com.seagate.kinetic.common.lib.KineticMessage; 
import com.seagate.kinetic.heartbeat.message.ByteCounter;

import com.seagate.kinetic.heartbeat.message.OperationCounter;

import com.seagate.kinetic.proto.Kinetic.Command;



import com.seagate.kinetic.proto.Kinetic.Command.GetLog.Capacity;

import com.seagate.kinetic.proto.Kinetic.Command.GetLog.Configuration;

import com.seagate.kinetic.proto.Kinetic.Command.GetLog.Limits;
@@ -93,7 +93,7 @@ public class GetLogHandler { 
        return hasPermission;

    }



    public static void handleGetLog(SimulatorEngine engine, KineticMessage request, KineticMessage kmresp) throws UnknownHostException {

    public static void handleGetLog(SimulatorEngine engine, KineticMessage request, KineticMessage kmresp) throws UnknownHostException, UnsupportedEncodingException {

        

        Command.Builder respCommandBuilder = (Command.Builder) kmresp.getCommand();
@@ -126,7 +126,7 @@ public class GetLogHandler { 
                }

                break;

            case CONFIGURATION:

                Configuration configuration = ConfigurationUtil.getConfiguration(engine.getServiceConfiguration());

                Configuration configuration = ConfigurationUtil.getConfiguration(engine);

                getLog.setConfiguration(configuration);

                break;

kinetic-simulator/src/main/java/com/seagate/kinetic/simulator/internal/SimulatorEngine.java

+2 −2
Original line number Diff line number Diff line
@@ -874,10 +874,10 @@ public class SimulatorEngine implements MessageService { 


        try {

            Configuration configuration = ConfigurationUtil

                    .getConfiguration(this.config);

                    .getConfiguration(this);

            cb.getBodyBuilder().getGetLogBuilder().getConfigurationBuilder()

                    .mergeFrom(configuration);

        } catch (UnknownHostException e) {

        } catch (Exception e) {

            logger.log(Level.WARNING, e.getMessage(), e);

        }

kinetic-simulator/src/main/java/com/seagate/kinetic/simulator/utility/ConfigurationUtil.java

+68 −6
Original line number Diff line number Diff line
@@ -19,12 +19,13 @@ 
 */

package com.seagate.kinetic.simulator.utility;



import java.io.UnsupportedEncodingException;

import java.net.Inet6Address;

import java.net.InetAddress;

import java.net.NetworkInterface;

import java.net.SocketException;

import java.net.UnknownHostException;

import java.nio.charset.Charset;



import java.util.ArrayList;

import java.util.Date;

import java.util.Enumeration;
@@ -37,6 +38,7 @@ import kinetic.simulator.SimulatorConfiguration; 
import com.google.protobuf.ByteString;

import com.seagate.kinetic.proto.Kinetic.Command.GetLog.Configuration;

import com.seagate.kinetic.proto.Kinetic.Command.GetLog.Configuration.Interface;

import com.seagate.kinetic.simulator.internal.SimulatorEngine;



public abstract class ConfigurationUtil {
@@ -44,19 +46,31 @@ public abstract class ConfigurationUtil { 
            .getLogger(ConfigurationUtil.class.getName());

    public final static String VENDER = "Seagate";

    public final static String MODEL = "Simulator";

    public final static byte[] SERIAL_NUMBER = "93C3DAFD-C894-3C88-A4B0-632A90D2A04B"

            .getBytes(Charset.forName("UTF-8"));

    

    public static final String SERIAL_PREFIX = "SIMULATOR-SN-";

     

    //public final static byte[] SERIAL_NUMBER = "93C3DAFD-C894-3C88-A4B0-632A90D2A04B"

    //        .getBytes(Charset.forName("UTF-8"));

    

    public final static String COMPILATION_DATE = new Date().toString();

    public final static String PROTOCOL_COMPILATION_DATE = new Date()

            .toString();



    @SuppressWarnings("static-access")

    public static Configuration getConfiguration(SimulatorConfiguration config)

            throws UnknownHostException {

    public static Configuration getConfiguration(SimulatorEngine engine)

            throws UnknownHostException, UnsupportedEncodingException {

        

        SimulatorConfiguration config = engine.getServiceConfiguration();

        

        Configuration.Builder configuration = Configuration.newBuilder();

        configuration.setVendor(VENDER);

        configuration.setModel(MODEL);

        configuration.setSerialNumber(ByteString.copyFrom(SERIAL_NUMBER));

        

        // get serial no for this instance

        String sn = getSerialNumber(engine);

        

        configuration.setSerialNumber(ByteString.copyFrom(sn, "UTF8"));

        

        configuration.setCompilationDate(COMPILATION_DATE);

        configuration.setProtocolCompilationDate(PROTOCOL_COMPILATION_DATE);
@@ -145,4 +159,52 @@ public abstract class ConfigurationUtil { 


        return sb.toString();

    }

    

    /**

     * calculate serial no.

     * <p>

     * A simulator instance serial number is calculated as follows.

     * <p> 

     * SN = SERIAL_PREFIX + ip + "-" + khomeHash + "-" + persistHome;

     * 

     * @param engine simulator engine

     * 

     * @return serial number for the specified instance of simulator

     */

    private static String getSerialNumber (SimulatorEngine engine) {

        

        SimulatorConfiguration config = engine.getServiceConfiguration();

        

        int khomeHash = Math.abs(engine.getKineticHome().hashCode());

        

        // get persist home name, use port# if not set

        String persistHome = config.getProperty(SimulatorConfiguration.PERSIST_HOME, String.valueOf(config.getPort()));

        

        //int phomeHash = Math.abs(persistHome.hashCode());

        

        // default ip of this instance

        String ip = "127.0.0.1";

        

        try {

            // get from Java API

            ip = InetAddress.getLocalHost().getHostAddress();

        } catch (Exception e) {

            ;

        }

        

        // construct sn

        String sn = SERIAL_PREFIX + ip + "-" + khomeHash + "-" + persistHome;

        

        // replace '_' with '-'

        sn = sn.replace('_', '-');

        

        // replace '.' with '-'

        sn = sn.replace('.', '-');

        

        // convert to upper case

        sn = sn.toUpperCase();

        

        // return sn for this instance

        return sn;

    }

}

kinetic-test/src/test/java/com/seagate/kinetic/example/openstorage/VirtualDrives.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import kinetic.simulator.SimulatorConfiguration; 
 */

public class VirtualDrives {

    

    public static final int MAX_SIMULATOR = 1000;

    public static final int MAX_SIMULATOR = 100;



    private int maxSimulator = MAX_SIMULATOR;