Skip to content

Commit

Permalink
Merge pull request #488 from tulumvinh/2.x
Browse files Browse the repository at this point in the history
Eliminate unneccessargy injection for parallization incremental upload
  • Loading branch information
tulumvinh authored Jun 13, 2016
2 parents 6e6dbb5 + 7cf684d commit e1db506
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions priam/src/main/java/com/netflix/priam/PriamServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import com.netflix.priam.aws.UpdateCleanupPolicy;
import com.netflix.priam.aws.UpdateSecuritySettings;
import com.netflix.priam.backup.CommitLogBackupTask;
import com.netflix.priam.backup.IIncrementalBackup;
import com.netflix.priam.backup.IncrementalBackup;
import com.netflix.priam.backup.Restore;
import com.netflix.priam.backup.SnapshotBackup;
Expand All @@ -51,20 +50,17 @@ public class PriamServer
private final InstanceIdentity id;
private final Sleeper sleeper;
private final ICassandraProcess cassProcess;
private IIncrementalBackup incrementalBkup;
private static final int CASSANDRA_MONITORING_INITIAL_DELAY = 10;
private static final Logger logger = LoggerFactory.getLogger(PriamServer.class);

@Inject
public PriamServer(IConfiguration config, PriamScheduler scheduler, InstanceIdentity id, Sleeper sleeper, ICassandraProcess cassProcess
, IIncrementalBackup incrementalBkup)
public PriamServer(IConfiguration config, PriamScheduler scheduler, InstanceIdentity id, Sleeper sleeper, ICassandraProcess cassProcess)
{
this.config = config;
this.scheduler = scheduler;
this.id = id;
this.sleeper = sleeper;
this.cassProcess = cassProcess;
this.incrementalBkup = incrementalBkup;
}

public void intialize() throws Exception
Expand Down Expand Up @@ -168,7 +164,6 @@ else if (UpdateSecuritySettings.firstTimeUpdated)
scheduler.addTask(IncrementalBackupProducer.JOBNAME, IncrementalBackupProducer.class, IncrementalBackupProducer.getTimer());
logger.info("Added incremental async-synchronous bkup, next fired time: " + IncrementalBackupProducer.getTimer().getTrigger().getNextFireTime());
}

}

}
Expand Down

0 comments on commit e1db506

Please sign in to comment.