Projects >> helix >>c0d27b1fcff3bedf3eb0259ffd14eea695ab2c38

Chunk
Conflicting content 
    }

    _version = new PropertiesReader("cluster-manager-version.properties")
<<<<<<< HEAD
                                .getProperty("clustermanager.version");
    
    _stateMachEngine = new HelixStateMachineEngine(this);
=======
        .getProperty("clustermanager.version");

    _stateMachEngine = new StateMachEngineImpl(this);
>>>>>>> 45efa1602200aaccf973059cb3513027cf00d575
    _messagingService.registerMessageHandlerFactory(MessageType.STATE_TRANSITION.toString(),
        _stateMachEngine);
  }
Solution content 
    }

    _version = new PropertiesReader("cluster-manager-version.properties")
        .getProperty("clustermanager.version");

    _stateMachEngine = new HelixStateMachineEngine(this);

    _messagingService.registerMessageHandlerFactory(
        MessageType.STATE_TRANSITION.toString(), _stateMachEngine);
  }
File
DynamicFileClusterManager.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
import org.apache.log4j.Logger;

<<<<<<< HEAD
import com.linkedin.helix.HelixAdmin;
=======
import com.linkedin.helix.ClusterManagementService;
import com.linkedin.helix.PropertyPathConfig;
>>>>>>> 45efa1602200aaccf973059cb3513027cf00d575
import com.linkedin.helix.PropertyType;
import com.linkedin.helix.ZNRecord;
import com.linkedin.helix.model.ExternalView;
Solution content 
import org.apache.log4j.Logger;

import com.linkedin.helix.HelixAdmin;
import com.linkedin.helix.PropertyPathConfig;
import com.linkedin.helix.PropertyType;
import com.linkedin.helix.ZNRecord;
import com.linkedin.helix.model.ExternalView;
File
FileClusterManagementTool.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    _transitionMethodFinder = new StateModelParser();
  }

<<<<<<< HEAD
  // // TODO replace with util from espresso or linkedin
  // private boolean isNullOrEmpty(String data)
  // {
  // return data == null || data.length() == 0 || data.trim().length() == 0;
  // }
  //
  // private boolean validateMessage(Message message)
  // {
  // boolean isValid =
  // isNullOrEmpty(message.getFromState()) || isNullOrEmpty(message.getToState())
  // || isNullOrEmpty(message.getToState())
  // || isNullOrEmpty(message.getStateUnitKey())
  // || isNullOrEmpty(message.getToState())
  // || isNullOrEmpty(message.getStateModelDef());
  // return !isValid;
  // }

  private void prepareMessageExecution(HelixAgent manager, Message message) throws HelixException
=======
  private void prepareMessageExecution(ClusterManager manager, Message message)
      throws ClusterManagerException
>>>>>>> 45efa1602200aaccf973059cb3513027cf00d575
  {
    // if (!validateMessage(message))
    if (!message.isValid())
Solution content 
    _transitionMethodFinder = new StateModelParser();
  }

  // // TODO replace with util from espresso or linkedin
  // private boolean isNullOrEmpty(String data)
  // {
  // return data == null || data.length() == 0 || data.trim().length() == 0;
  // }
  //
  // private boolean validateMessage(Message message)
  // {
  // boolean isValid =
  // isNullOrEmpty(message.getFromState()) || isNullOrEmpty(message.getToState())
  // || isNullOrEmpty(message.getToState())
  // || isNullOrEmpty(message.getStateUnitKey())
  // || isNullOrEmpty(message.getToState())
  // || isNullOrEmpty(message.getStateModelDef());
  // return !isValid;
  // }

  private void prepareMessageExecution(HelixAgent manager, Message message) throws HelixException

  {
    // if (!validateMessage(message))
    if (!message.isValid())
File
CMStateTransitionHandler.java
Developer's decision
Version 1
Kind of conflict
Comment
Method signature
Chunk
Conflicting content 
    if (stateModelDef == null)
    {
<<<<<<< HEAD
      throw new HelixException("No State Model Defined for "+ message.getStateModelDef());
=======
      throw new ClusterManagerException("No State Model Defined for " + message.getStateModelDef());
>>>>>>> 45efa1602200aaccf973059cb3513027cf00d575
    }
    String initStateValue = stateModelDef.getInitialState();
    CurrentState currentState = accessor.getProperty(CurrentState.class,
Solution content 
    if (stateModelDef == null)
    {
      throw new HelixException("No State Model Defined for "+ message.getStateModelDef());

    }
    String initStateValue = stateModelDef.getInitialState();
    CurrentState currentState = accessor.getProperty(CurrentState.class,
File
CMStateTransitionHandler.java
Developer's decision
Version 1
Kind of conflict
Throw statement
Chunk
Conflicting content 
    }
  }

<<<<<<< HEAD
  void postExecutionMessage(HelixAgent manager,
                            Message message,
                            NotificationContext context,
                            CMTaskResult taskResult,
                            Exception exception) throws InterruptedException
=======
  void postExecutionMessage(ClusterManager manager, Message message, NotificationContext context,
      CMTaskResult taskResult, Exception exception) throws InterruptedException
>>>>>>> 45efa1602200aaccf973059cb3513027cf00d575
  {
    DataAccessor accessor = manager.getDataAccessor();
    try
Solution content 
    }
  }

  void postExecutionMessage(HelixAgent manager,
                            Message message,
                            NotificationContext context,
                            CMTaskResult taskResult,
                            Exception exception) throws InterruptedException
  {
    DataAccessor accessor = manager.getDataAccessor();
    try
File
CMStateTransitionHandler.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
    }
  }

<<<<<<< HEAD
  private void invoke(DataAccessor accessor,
                      NotificationContext context,
                      CMTaskResult taskResult,
                      Message message) throws IllegalAccessException,
      InvocationTargetException,
      InterruptedException
=======
  private void invoke(ClusterDataAccessor accessor, NotificationContext context,
      CMTaskResult taskResult, Message message) throws IllegalAccessException,
      InvocationTargetException, InterruptedException
>>>>>>> 45efa1602200aaccf973059cb3513027cf00d575
  {
    _statusUpdateUtil.logInfo(message, CMStateTransitionHandler.class, "Message handling invoking",
        accessor);
Solution content 
    }
  }

  private void invoke(DataAccessor accessor,
                      NotificationContext context,
                      CMTaskResult taskResult,
                      Message message) throws IllegalAccessException,
      InvocationTargetException,
      InterruptedException
  {
    _statusUpdateUtil.logInfo(message, CMStateTransitionHandler.class, "Message handling invoking",
        accessor);
File
CMStateTransitionHandler.java
Developer's decision
Version 1
Kind of conflict
Method signature