Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change the order of the function library check/load. #3464

Closed
wants to merge 1 commit into from
Closed

Change the order of the function library check/load. #3464

wants to merge 1 commit into from

Conversation

FransUrbo
Copy link
Contributor

  • Change the order of the function library check/load.
    Redhat based system can have a /lib/lsb/init-functions file (from
    the redhat-lsb-core package), but it's only partially what we can use.
    Instead, look for that file last, giving the script a chance to catch
    the 'real' distribution file.
  • Filter out dashes in dataset name in read_mtab().

Signed-off-by: Turbo Fredriksson [email protected]
Closes #3463

@FransUrbo FransUrbo force-pushed the fixes.initscripts branch 8 times, most recently from f2afd0e to c31e7ff Compare June 3, 2015 21:10
@FransUrbo
SYSV init script fixes.
c31e7ff 
* Change the order of the function library check/load.
  Redhat based system _can_ have a /lib/lsb/init-functions file (from
  the redhat-lsb-core package), but it's only partially what we can use.
  Instead, look for that file last, giving the script a chance to catch
  the 'real' distribution file.
* Filter out dashes and dots in dataset name in read_mtab().
* Get rid of 'awk' entirely. This is usually in /usr, which might not
  be availible.
* Get rid of the 'find /dev/disk/by-*' (find is on /usr, which might not
  be availible). Instead use echo in a for loop.
* Rebuild scripts if any of the *.in files changed.
* Move the sed part that filters out duplicates inside the check fo
  valid variable.

Signed-off-by: Turbo Fredriksson [email protected]
Closes openzfs#3463
Closes openzfs#3457
@behlendorf
Copy link
Contributor

Merged as:

4f38c25 SYSV init script fixes.

@behlendorf behlendorf closed this Jun 5, 2015
kernelOfTruth pushed a commit to kernelOfTruth/zfs that referenced this pull request Nov 4, 2015
@scsiguy @kernelOfTruth
Illumos 6171 dsl_prop_unregister() slows down dataset eviction.
0a06bef 
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Prakash Surya <[email protected]>
Approved by: Dan McDonald <[email protected]>

References:
https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction.
illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297

Porting notes:
Notable changes from upstream are caused by the following commits:
openzfs@3558fd7 Prototype/structure update for Linux
openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev()
openzfs@13fe019 Illumos openzfs#3464

Ported-by: kernelOfTruth [email protected]
@kernelOfTruth kernelOfTruth mentioned this pull request Nov 4, 2015
Closed
kernelOfTruth pushed a commit to kernelOfTruth/zfs that referenced this pull request Nov 6, 2015
@scsiguy @kernelOfTruth
Illumos 6171 dsl_prop_unregister() slows down dataset eviction.
ffbd17c 
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Prakash Surya <[email protected]>
Approved by: Dan McDonald <[email protected]>

References:
https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction.
illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297

Porting notes:
Notable changes from upstream are caused by the following commits:
openzfs@3558fd7 Prototype/structure update for Linux
openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev()
openzfs@13fe019 Illumos openzfs#3464

Fix compilation error:
dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function)
 EXPORT_SYMBOL(dsl_prop_unregister);

Replacing
EXPORT_SYMBOL(dsl_prop_unregister);
with
EXPORT_SYMBOL(dsl_prop_unregister_all);

Ported-by: kernelOfTruth [email protected]
kernelOfTruth pushed a commit to kernelOfTruth/zfs that referenced this pull request Nov 12, 2015
@scsiguy @kernelOfTruth
Illumos 6171 dsl_prop_unregister() slows down dataset eviction.
70559ae 
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Prakash Surya <[email protected]>
Approved by: Dan McDonald <[email protected]>

References:
https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction.
illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297

Porting notes:
Notable changes from upstream are caused by the following commits:
openzfs@3558fd7 Prototype/structure update for Linux
openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev()
openzfs@13fe019 Illumos openzfs#3464

Fix compilation error:
dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function)
 EXPORT_SYMBOL(dsl_prop_unregister);

Replacing
EXPORT_SYMBOL(dsl_prop_unregister);
with
EXPORT_SYMBOL(dsl_prop_unregister_all);

Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h

Ported-by: kernelOfTruth [email protected]
kernelOfTruth pushed a commit to kernelOfTruth/zfs that referenced this pull request Nov 21, 2015
@scsiguy @kernelOfTruth
Illumos 6171 dsl_prop_unregister() slows down dataset eviction.
6ae1179 
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Prakash Surya <[email protected]>
Approved by: Dan McDonald <[email protected]>

References:
https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction.
illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297

Porting notes:
Notable changes from upstream are caused by the following commits:
openzfs@3558fd7 Prototype/structure update for Linux
openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev()
openzfs@13fe019 Illumos openzfs#3464

Fix compilation error:
dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function)
 EXPORT_SYMBOL(dsl_prop_unregister);

Replacing
EXPORT_SYMBOL(dsl_prop_unregister);
with
EXPORT_SYMBOL(dsl_prop_unregister_all);

Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h

Ported-by: kernelOfTruth [email protected]
kernelOfTruth pushed a commit to kernelOfTruth/zfs that referenced this pull request Dec 10, 2015
@scsiguy @kernelOfTruth
Illumos 6171 dsl_prop_unregister() slows down dataset eviction.
3aa4fe6 
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Prakash Surya <[email protected]>
Approved by: Dan McDonald <[email protected]>

References:
https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction.
illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297

Porting notes:
Notable changes from upstream are caused by the following commits:
openzfs@3558fd7 Prototype/structure update for Linux
openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev()
openzfs@13fe019 Illumos openzfs#3464

Fix compilation error:
dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function)
 EXPORT_SYMBOL(dsl_prop_unregister);

Replacing
EXPORT_SYMBOL(dsl_prop_unregister);
with
EXPORT_SYMBOL(dsl_prop_unregister_all);

Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h

Conflicts during rebase on December 9th 2015
in include/sys/dsl_dataset.h
due to openzfs@241b541
(Illumos 5959 - clean up per-dataset feature count code)

Ported-by: kernelOfTruth [email protected]
kernelOfTruth pushed a commit to kernelOfTruth/zfs that referenced this pull request Dec 11, 2015
@scsiguy @kernelOfTruth
Illumos 6171 dsl_prop_unregister() slows down dataset eviction.
e64d434 
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Prakash Surya <[email protected]>
Approved by: Dan McDonald <[email protected]>

References:
https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction.
illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297

Porting notes:
Notable changes from upstream are caused by the following commits:
openzfs@3558fd7 Prototype/structure update for Linux
openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev()
openzfs@13fe019 Illumos openzfs#3464

Fix compilation error:
dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function)
 EXPORT_SYMBOL(dsl_prop_unregister);

Replacing
EXPORT_SYMBOL(dsl_prop_unregister);
with
EXPORT_SYMBOL(dsl_prop_unregister_all);

Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h

Conflicts during rebase on December 9th 2015
in include/sys/dsl_dataset.h
due to openzfs@241b541
(Illumos 5959 - clean up per-dataset feature count code)

Ported-by: kernelOfTruth [email protected]
kernelOfTruth pushed a commit to kernelOfTruth/zfs that referenced this pull request Dec 12, 2015
@scsiguy @kernelOfTruth
Illumos 6171 dsl_prop_unregister() slows down dataset eviction.
5d88463 
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Prakash Surya <[email protected]>
Approved by: Dan McDonald <[email protected]>

References:
https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction.
illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297

Porting notes:
Notable changes from upstream are caused by the following commits:
openzfs@3558fd7 Prototype/structure update for Linux
openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev()
openzfs@13fe019 Illumos openzfs#3464

Fix compilation error:
dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function)
 EXPORT_SYMBOL(dsl_prop_unregister);

Replacing
EXPORT_SYMBOL(dsl_prop_unregister);
with
EXPORT_SYMBOL(dsl_prop_unregister_all);

Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h

Conflicts during rebase on December 9th 2015
in include/sys/dsl_dataset.h
due to openzfs@241b541
(Illumos 5959 - clean up per-dataset feature count code)

Ported-by: kernelOfTruth [email protected]
kernelOfTruth pushed a commit to kernelOfTruth/zfs that referenced this pull request Jan 6, 2016
@scsiguy @kernelOfTruth
Illumos 6171 dsl_prop_unregister() slows down dataset eviction.
e9ebd01 
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Prakash Surya <[email protected]>
Approved by: Dan McDonald <[email protected]>

References:
https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction.
illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297

Porting notes:
Notable changes from upstream are caused by the following commits:
openzfs@3558fd7 Prototype/structure update for Linux
openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev()
openzfs@13fe019 Illumos openzfs#3464

Fix compilation error:
dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function)
 EXPORT_SYMBOL(dsl_prop_unregister);

Replacing
EXPORT_SYMBOL(dsl_prop_unregister);
with
EXPORT_SYMBOL(dsl_prop_unregister_all);

Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h

Conflicts during rebase on December 9th 2015
in include/sys/dsl_dataset.h
due to openzfs@241b541
(Illumos 5959 - clean up per-dataset feature count code)

Ported-by: kernelOfTruth [email protected]
kernelOfTruth pushed a commit to kernelOfTruth/zfs that referenced this pull request Jan 10, 2016
@scsiguy @kernelOfTruth
Illumos 6171 dsl_prop_unregister() slows down dataset eviction.
9c69d09 
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Prakash Surya <[email protected]>
Approved by: Dan McDonald <[email protected]>

References:
https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction.
illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297

Porting notes:
Notable changes from upstream are caused by the following commits:
openzfs@3558fd7 Prototype/structure update for Linux
openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev()
openzfs@13fe019 Illumos openzfs#3464

Fix compilation error:
dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function)
 EXPORT_SYMBOL(dsl_prop_unregister);

Replacing
EXPORT_SYMBOL(dsl_prop_unregister);
with
EXPORT_SYMBOL(dsl_prop_unregister_all);

Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h

Conflicts during rebase on December 9th 2015
in include/sys/dsl_dataset.h
due to openzfs@241b541
(Illumos 5959 - clean up per-dataset feature count code)

Ported-by: kernelOfTruth [email protected]
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Jan 12, 2016
@scsiguy @behlendorf
Illumos 6171 - dsl_prop_unregister() slows down dataset eviction.
0eb2161 
6171 dsl_prop_unregister() slows down dataset eviction.
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Prakash Surya <[email protected]>
Approved by: Dan McDonald <[email protected]>

References:
  https://www.illumos.org/issues/6171
  illumos/illumos-gate@03bad06

Porting notes:
  - Conflicts
    - 3558fd7 Prototype/structure update for Linux
    - 2cf7f52 Linux compat 2.6.39: mount_nodev()
    - 13fe019 Illumos openzfs#3464
    - 241b541 Illumos 5959 - clean up per-dataset feature count code
  - dsl_prop_unregister() preserved until out of tree consumers
    like Lustre can transition to dsl_prop_unregister_all().
  - Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h

Ported-by: kernelOfTruth [email protected]
Signed-off-by: Brian Behlendorf <[email protected]>
goulvenriou pushed a commit to Alyseo/zfs that referenced this pull request Jan 17, 2016
@scsiguy
Illumos 6171 - dsl_prop_unregister() slows down dataset eviction.
be7abe6 
6171 dsl_prop_unregister() slows down dataset eviction.
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Prakash Surya <[email protected]>
Approved by: Dan McDonald <[email protected]>

References:
  https://www.illumos.org/issues/6171
  illumos/illumos-gate@03bad06

Porting notes:
  - Conflicts
    - 3558fd7 Prototype/structure update for Linux
    - 2cf7f52 Linux compat 2.6.39: mount_nodev()
    - 13fe019 Illumos openzfs#3464
    - 241b541 Illumos 5959 - clean up per-dataset feature count code
  - dsl_prop_unregister() preserved until out of tree consumers
    like Lustre can transition to dsl_prop_unregister_all().
  - Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h

Ported-by: kernelOfTruth [email protected]
Signed-off-by: Brian Behlendorf <[email protected]>
goulvenriou pushed a commit to Alyseo/zfs that referenced this pull request Feb 4, 2016
@scsiguy
Illumos 6171 - dsl_prop_unregister() slows down dataset eviction.
a39887c 
6171 dsl_prop_unregister() slows down dataset eviction.
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Prakash Surya <[email protected]>
Approved by: Dan McDonald <[email protected]>

References:
  https://www.illumos.org/issues/6171
  illumos/illumos-gate@03bad06

Porting notes:
  - Conflicts
    - 3558fd7 Prototype/structure update for Linux
    - 2cf7f52 Linux compat 2.6.39: mount_nodev()
    - 13fe019 Illumos openzfs#3464
    - 241b541 Illumos 5959 - clean up per-dataset feature count code
  - dsl_prop_unregister() preserved until out of tree consumers
    like Lustre can transition to dsl_prop_unregister_all().
  - Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h

Ported-by: kernelOfTruth [email protected]
Signed-off-by: Brian Behlendorf <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

CentOS 6 init script errors
2 participants
@FransUrbo @behlendorf