Alon Bar-Lev has posted comments on this change.
Change subject: bootstrap: send complete bootstrap from engine
......................................................................
Patch Set 15: (6 inline comments)
Doron, some answers.
Yes, I checked node.
For the dependency, juan asked to use the apache, I initially used javatar, see
above patches. But I am not sure why there is a problem as rhel does not
support apache-sshd either.
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsInstaller.java
Line 122: }
Line 123: s_bootstrapPackage = new CachedTar(
Line 124: new File(cache, Config.<String>
GetValue(ConfigValues.BootstrapPackageName)),
Line 125: new File(Config.<String>
GetValue(ConfigValues.BootstrapPackageDirectory))
Line 126: );
The constructor can run 10000 times, it just stores the data in members.
Last wins.
Better than synchronizing the threads.
Line 127: }
Line 128:
Line 129: VdsGroupDAO vdsGroupDao =
DbFacade.getInstance().getVdsGroupDAO();
Line 130: Guid vdsGroupId = vds.getvds_group_id();
Line 143: if (!supportVirt) {
Line 144: _bootstrapCommand =
_bootstrapCommand.replace("{virt-placeholder}", "-V");
Line 145: } else {
Line 146: _bootstrapCommand =
_bootstrapCommand.replace("{virt-placeholder}", "");
Line 147: }
I did not change this.
Line 148:
Line 149: // We pass -g option if gluster is supported on this host
Line 150: if (supportGluster) {
Line 151: _bootstrapCommand =
_bootstrapCommand.replace("{gluster-placeholder}", "-g");
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
Line 1424: "-O '{OrganizationName}' -t {utc_time}
{OverrideFirewall} " +
Line 1425: "-S {SSHKey} {EnginePort} -b {virt-placeholder} " +
Line 1426: "{gluster-placeholder} {URL1} {URL1} {vds-server} " +
Line 1427: "{GUID} {RunFlag}"
Line 1428: )
It should not be backward compatible as it runs the new bootstrap.
Line 1429: BootstrapCommand(373),
Line 1430:
Line 1431: @TypeConverterAttribute(Integer.class)
Line 1432: @DefaultValueAttribute("10000")
....................................................
File
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/Tar.java
Line 86: *
Line 87: * Only regular files and directories are supported.
Line 88: * Files will be owner rw and optional execute bit.
Line 89: */
Line 90: public static void doTar(
I use atomic move. Either the existing or the newer will be used.
Line 91: OutputStream os,
Line 92: File base
Line 93: ) throws SecurityException, IOException {
Line 94: TarArchiveOutputStream archive = null;
....................................................
File
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/VdsInstallerSSH.java
Line 524: }
Line 525:
Line 526: fingerprint = OpenSSHUtils.getKeyString(
Line 527: cert.getPublicKey(),
Line 528: "ovirt-engine"
This is how it was.
I will create another patch for this.
Line 529: );
Line 530: }
Line 531: catch (Exception e) {
Line 532: log.error(
....................................................
File pom.xml
Line 24: <commons-logging.version>1.1</commons-logging.version>
Line 25: <junit.version>4.7</junit.version>
Line 26: <commons-codec.version>1.4</commons-codec.version>
Line 27: <commons-lang.version>2.4</commons-lang.version>
Line 28: <commons-compress.version>1.4.1</commons-compress.version>
Not sure I follow, we have a lot of dependencies without RHEL.
Line 29: <quartz.version>2.1.2</quartz.version>
Line 30: <postgres.jdbc.version>8.4-702.jdbc4</postgres.jdbc.version>
Line 31: <commons-collections>3.1</commons-collections>
Line 32: <javax.transaction>1.1</javax.transaction>
--
To view, visit http://gerrit.ovirt.org/6963
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I6f4a09ca9e66f0c9f5f4f7b283a5f43986b7e603
Gerrit-PatchSet: 15
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Alex Lourie <[email protected]>
Gerrit-Reviewer: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Barak Azulay <[email protected]>
Gerrit-Reviewer: Doron Fediuck <[email protected]>
Gerrit-Reviewer: Douglas Schilling Landgraf <[email protected]>
Gerrit-Reviewer: Juan Hernandez <[email protected]>
Gerrit-Reviewer: Ofer Schreiber <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
